Changed id type to uuid.

app/controllers/publishRealEstate.js

@@ -1,6 +1,5 @@
-const { currentRealEstate } = require("../helpers/url");
-const { createRealEstate } = require("../helpers/db/realEstate");
-const { getKiviOriginalById } = require("../helpers/db/kiviOriginal");
+const { findRealEstateByAgencyId } = require("../helpers/db/realEstate");
+const { currentKiviRealEstate } = require("../helpers/url");
 
 const validate = require("validate.js");
 
@@ -20,7 +19,9 @@ const {
 } = require("../common/publishEnums");
 
 const getPublishInputs = async (req, res) => {
-  const realEstate = await currentRealEstate(req);
+  const kiviOriginal = await currentKiviRealEstate(req);
+
+  const realEstate = await findRealEstateByAgencyId(kiviOriginal.kiviAdId);
 
   if (!realEstate || !realEstate.dataValues) {
     res.render("notFound", { title: " " });
@@ -170,17 +171,15 @@ const getPublishInputs = async (req, res) => {
 };
 
 const postPublishInputs = async (req, res) => {
-  const realEstate = await currentRealEstate(req);
+  const kiviOriginal = await currentKiviRealEstate(req);
+
+  const realEstate = await findRealEstateByAgencyId(kiviOriginal.kiviAdId);
 
   if (!realEstate || !realEstate.dataValues) {
     res.render("notFound", { title: " " });
     return;
   }
 
-  const kiviOriginal = await getKiviOriginalById(
-    parseInt(realEstate.dataValues.agencyObjectId)
-  );
-
   const nextStepPage = req.query.nextStep || "/uspjesnaobjava";
 
   const balcony = req.body.balcony === "on";

app/controllers/publishRealEstateTypes.js

@@ -1,11 +1,16 @@
-const { currentRealEstate } = require("../helpers/url");
-const { createRealEstate } = require("../helpers/db/realEstate");
+const { currentKiviRealEstate } = require("../helpers/url");
+const {
+  createRealEstate,
+  findRealEstateByAgencyId
+} = require("../helpers/db/realEstate");
 const { createKiviOriginal } = require("../helpers/db/kiviOriginal");
 
 const { AD_CATEGORY, AD_TYPE, AD_AGENCY } = require("../common/enums");
 
 const getPublishTypes = async (req, res) => {
-  const realEstate = await currentRealEstate(req);
+  const kiviOriginal = await currentKiviRealEstate(req);
+
+  const realEstate = await findRealEstateByAgencyId(kiviOriginal.kiviAdId);
 
   const title = "Koju nekretninu nudite?";
   let selectedAdType = AD_TYPE.AD_TYPE_SALE.id;
@@ -32,7 +37,9 @@ const getPublishTypes = async (req, res) => {
 };
 
 const postPublishTypes = async (req, res) => {
-  const realEstate = await currentRealEstate(req);
+  const kiviOriginal = await currentKiviRealEstate(req);
+
+  const realEstate = await findRealEstateByAgencyId(kiviOriginal.kiviAdId);
 
   const adType = parseInt(req.body.adType);
 
@@ -57,8 +64,10 @@ const postPublishTypes = async (req, res) => {
   const nextStepPage = req.query.nextStep || "podacionekretnini";
 
   let nextStepUrl = "";
-  if (realEstate && realEstate.id) {
-    nextStepUrl = `/${nextStepPage}/${realEstate.id}`;
+  if (kiviOriginal && kiviOriginal.kiviAdId && realEstate && realEstate.id) {
+    //
+    nextStepUrl = `/${nextStepPage}/${kiviOriginal.kiviAdId}`;
+
     realEstate.adType = adTypeStringId;
     realEstate.realEstateType = selectedRealEstateType;
 
@@ -77,8 +86,7 @@ const postPublishTypes = async (req, res) => {
         agencyObjectId: newKiviOriginal.kiviAdId
       });
 
-      //Da li ovaj id ili kivioriginal id ???
-      nextStepUrl = `/${nextStepPage}/${newRealEstate.id}`;
+      nextStepUrl = `/${nextStepPage}/${newKiviOriginal.kiviAdId}`;
     } catch (error) {
       console.log(error);
       nextStepUrl = `/`;

app/controllers/welcome.js

@@ -33,7 +33,7 @@ const postWelcome = async (req, res) => {
     const adTypeStringId = getAdTypeString(publishAdType);
 
     try {
-      //Firt we create new Kivi Ad Original object in db then new Real Estate
+      //First we create new Kivi Ad Original object in db then new Real Estate
       //Problem with id-s
       const newKiviOriginal = await createKiviOriginal({
         email: ""
@@ -42,13 +42,13 @@ const postWelcome = async (req, res) => {
       const newRealEstate = await createRealEstate({
         adType: adTypeStringId,
         realEstateType: AD_CATEGORY.FLAT.id,
-        //Temp variables because of the not null constraints
+        //Temp variable because of the not null constraints
         url: "http://localhost:5000/",
         originAgencyName: AD_AGENCY.KIVI,
         agencyObjectId: newKiviOriginal.kiviAdId
       });
 
-      nextStepUrl = `/objavinekretninu/${newRealEstate.id}`;
+      nextStepUrl = `/objavinekretninu/${newKiviOriginal.kiviAdId}`;
     } catch (error) {
       console.log(error);
       nextStepUrl = `/`;