modified migrations to set field names with underscore snackcase only, apis to syn portfolio, buildings and units data, removed index.js from model, added index.ts file in src/model task - #7658,#7659, #7660

src/controllers/propertyware/buildings.controller.ts

@@ -0,0 +1,34 @@
+import { Request, Response } from 'express';
+
+import { fetchBuildings } from '../../shared/services/propertyware.service';
+import PwBuildings from '../../models/pwBuildings';
+
+export const syncBuildingsData = async (req: Request, res: Response) => {
+    try {
+
+        const buildingsData = await fetchBuildings();
+        
+        console.log(buildingsData);
+        const buildingsResponseData = buildingsData.map((Buildings: Record<string, string>) => ({
+            pw_id: Buildings.id,
+            name: Buildings.name,
+            pw_portfolio_id:Buildings.portfolioID
+        }));
+        console.log(buildingsResponseData);
+
+        try {
+
+            const createResult = await PwBuildings.bulkCreate(buildingsResponseData, {
+                updateOnDuplicate: ['name', 'pw_portfolio_id'],
+            });
+
+            res.end("Portfolio data synced successfully");
+        } catch(error) {
+            console.log('Error inserting Buildings');
+            console.log(error);
+        }
+
+    } catch (error) {
+        console.error('Error fetching Buildings:', error);
+    }
+};

src/controllers/propertyware/portfolio.controller.ts

@@ -0,0 +1,33 @@
+import { Request, Response } from 'express';
+
+import { fetchPortfolio } from '../../shared/services/propertyware.service';
+import PwPortfolio from './../../models/pwPortfolio';
+
+export const syncPortfolioData = async (req: Request, res: Response) => {
+    try {
+
+        const portfolioData = await fetchPortfolio();
+
+        const portfolioResponseData = portfolioData.map((portfolio: { id: any; name: any; }) => ({
+            pw_id: portfolio.id,
+            name: portfolio.name,
+        }));
+
+        try {
+
+            const createResult = await PwPortfolio.bulkCreate(portfolioResponseData, {
+                updateOnDuplicate: ['name'],
+            });
+
+            res.end("Portfolio data synced successfully");
+            
+        } catch (error) {
+            console.log(error);
+            res.end("Error inserting Portfolio");
+        }
+
+    } catch (error) {
+        console.error(error);
+        res.end("Error fetching Portfolio");
+    }
+};

src/controllers/propertyware/units.controller.ts

@@ -0,0 +1,36 @@
+import { Request, Response } from 'express';
+
+import { fetchUnits } from '../../shared/services/propertyware.service';
+import PwUnits from './../../models/pwUnits';
+
+export const syncUnitsData = async (req: Request, res: Response) => {
+    try {
+
+        const unitsData = await fetchUnits();
+
+        const unitsResponseData = unitsData.map((unit: Record<string, string>) => ({
+            pw_id: unit.id,
+            name: unit.name,
+            pw_portfolio_id:unit.portfolioID,
+            pw_building_id:unit.buildingID
+
+        }));
+
+        try {
+
+            const createResult = await PwUnits.bulkCreate(unitsResponseData, {
+                updateOnDuplicate: ['name','pw_portfolio_id', 'pw_building_id'],
+            });
+
+            res.end("Units data synced successfully");
+            
+        } catch (error) {
+            console.log(error);
+            res.end("Error inserting Units");
+        }
+
+    } catch (error) {
+        console.error(error);
+        res.end("Error fetching Units");
+    }
+};

src/db/migrations/20240710112620-create-roles-table.js

@@ -20,11 +20,11 @@ module.exports = {
         type: Sequelize.TEXT
       },
 
-      createdAt: {
+      created_at: {
         type: Sequelize.DATE
       },
       
-      updatedAt: {
+      updated_at: {
         type: Sequelize.DATE
       }
     });
@@ -32,4 +32,4 @@ module.exports = {
   async down(queryInterface, Sequelize) {
     await queryInterface.dropTable('Roles');
   }
-};
+};

src/db/migrations/20240710113255-create-user-table.js

@@ -35,11 +35,11 @@ module.exports = {
         allowNull: false
       },
 
-      createdAt: {
+      created_at: {
         type: Sequelize.DATE
       },
       
-      updatedAt: {
+      updated_at: {
         type: Sequelize.DATE
       }
     });

src/db/migrations/20240710114725-create-permissions-table.js

@@ -25,12 +25,12 @@ module.exports = {
         type: Sequelize.STRING
       },
 
-      createdAt: {
+      created_at: {
         allowNull: false,
         type: Sequelize.DATE
       },
       
-      updatedAt: {
+      updated_at: {
         allowNull: false,
         type: Sequelize.DATE
       }
@@ -39,4 +39,4 @@ module.exports = {
   async down(queryInterface, Sequelize) {
     await queryInterface.dropTable('Permissions');
   }
-};
+};

src/db/migrations/20240710122848-create-settings.js

@@ -18,12 +18,12 @@ module.exports = {
         type: Sequelize.TEXT
       },
       
-      createdAt: {
+      created_at: {
         allowNull: false,
         type: Sequelize.DATE
       },
       
-      updatedAt: {
+      updated_at: {
         allowNull: false,
         type: Sequelize.DATE
       }
@@ -32,4 +32,4 @@ module.exports = {
   async down(queryInterface, Sequelize) {
     await queryInterface.dropTable('Settings');
   }
-};
+};

src/db/migrations/20240711090014-create-pw-portfolio-table.js

@@ -12,17 +12,17 @@ module.exports = {
       pw_id: {
         unique: true,
         allowNull: false,
-        type: Sequelize.INTEGER
+        type: Sequelize.BIGINT
       },
       name: {
         allowNull: false,
         type: Sequelize.STRING
       },
-      createdAt: {
+      created_at: {
         allowNull: false,
         type: Sequelize.DATE
       },
-      updatedAt: {
+      updated_at: {
         allowNull: false,
         type: Sequelize.DATE
       }
@@ -31,4 +31,4 @@ module.exports = {
   async down(queryInterface, Sequelize) {
     await queryInterface.dropTable('pw_portfolio');
   }
-};
+};

src/db/migrations/20240711100526-create-pw-buildings-table.js

@@ -12,25 +12,25 @@ module.exports = {
       pw_id: {
         unique: true,
         allowNull: false,
-        type: Sequelize.INTEGER
+        type: Sequelize.BIGINT
       },
       name: {
         allowNull: false,
         type: Sequelize.STRING
       },
-      pw_portfolioID: {
+      pw_portfolio_id: {
         allowNull: false,
-        type: Sequelize.INTEGER,
+        type: Sequelize.BIGINT,
         references: {
           model: 'pw_portfolio', 
           key: 'pw_id'
         },
       },
-      createdAt: {
+      created_at: {
         allowNull: false,
         type: Sequelize.DATE
       },
-      updatedAt: {
+      updated_at: {
         allowNull: false,
         type: Sequelize.DATE
       }
@@ -39,4 +39,4 @@ module.exports = {
   async down(queryInterface, Sequelize) {
     await queryInterface.dropTable('pw_buildings');
   }
-};
+};

src/db/migrations/20240711103246-create-pw-units-table.js

@@ -12,33 +12,33 @@ module.exports = {
       pw_id: {
         unique: true,
         allowNull: false,
-        type: Sequelize.INTEGER
+        type: Sequelize.BIGINT
       },
       name: {
         allowNull: false,
         type: Sequelize.STRING
       },
-      pw_portfolioID: {
+      pw_portfolio_id: {
         allowNull: false,
-        type: Sequelize.INTEGER,
+        type: Sequelize.BIGINT,
         references: {
           model: 'pw_portfolio', 
           key: 'pw_id'
         },
       },
-      pw_buildingID: {
+      pw_building_id: {
         allowNull: false,
-        type: Sequelize.INTEGER,
+        type: Sequelize.BIGINT,
         references: {
           model: 'pw_buildings', 
           key: 'pw_id'
         },
       },
-      createdAt: {
+      created_at: {
         allowNull: false,
         type: Sequelize.DATE
       },
-      updatedAt: {
+      updated_at: {
         allowNull: false,
         type: Sequelize.DATE
       }
@@ -47,4 +47,4 @@ module.exports = {
   async down(queryInterface, Sequelize) {
     await queryInterface.dropTable('pw_units');
   }
-};
+};

src/models/index.js

@@ -1,43 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const Sequelize = require('sequelize');
-const process = require('process');
-const basename = path.basename(__filename);
-const env = process.env.NODE_ENV || 'development';
-const config = require(__dirname + '/../db/config/config.js')[env];
-const db = {};
-
-let sequelize;
-if (config.use_env_variable) {
-  sequelize = new Sequelize(process.env[config.use_env_variable], config);
-} else {
-  sequelize = new Sequelize(config.database, config.username, config.password, config);
-}
-
-fs
-  .readdirSync(__dirname)
-  .filter(file => {
-    return (
-      file.indexOf('.') !== 0 &&
-      file !== basename &&
-      file.slice(-3) === '.js' &&
-      file.indexOf('.test.js') === -1
-    );
-  })
-  .forEach(file => {
-    const model = require(path.join(__dirname, file))(sequelize, Sequelize.DataTypes);
-    db[model.name] = model;
-  });
-
-Object.keys(db).forEach(modelName => {
-  if (db[modelName].associate) {
-    db[modelName].associate(db);
-  }
-});
-
-db.sequelize = sequelize;
-db.Sequelize = Sequelize;
-
-module.exports = db;

src/{db/models → models}/index.ts

@@ -1,6 +1,6 @@
 import { Options, Sequelize } from "sequelize";
 
-import { config } from "db/config/db.config";
+import { config } from "../db/config/db.config";
 
 export const sequelize = new Sequelize(
   config.database as string,

src/models/permissions.ts

@@ -6,9 +6,9 @@ import {
   CreationOptional,
 } from 'sequelize';
 
-import { sequelize } from '../db/models/index'; 
+import { sequelize } from './index'; 
 import Role from './roles'; 
-import { PermissionInterface } from '../shared/permission.interface';
+import { PermissionInterface } from '../shared/interfaces/permission.interface';
 
 class Permission extends Model<InferAttributes<Permission>, InferCreationAttributes<Permission>> implements PermissionInterface {
   declare id: CreationOptional<number>;
@@ -54,4 +54,4 @@ Permission.init(
 
 Permission.belongsTo(Role, { foreignKey: 'role_id', onDelete: 'CASCADE' }); 
 
-export default Permission;
+export default Permission;

src/models/pwBuildings.ts

@@ -5,7 +5,7 @@ import {
   InferCreationAttributes,
   CreationOptional,
 } from 'sequelize';
-import { sequelize } from '../db/models/index';
+import { sequelize } from './index';
 import PwPortfolio from './pwPortfolio';
 import { PwBuildingInterface } from '../shared/interfaces/pwBuilding.interface';
 import PwUnit from './pwUnits';
@@ -18,7 +18,7 @@ class PwBuilding
   declare id?: CreationOptional<number>;
   declare name: string;
   declare pw_id: number;
-  declare pw_portfolioID: number;
+  declare pw_portfolio_id: number;
 }
 
 PwBuilding.init(
@@ -41,7 +41,7 @@ PwBuilding.init(
       allowNull: false,
     },
 
-    pw_portfolioID: {
+    pw_portfolio_id: {
       type: DataTypes.INTEGER.UNSIGNED,
       allowNull: false,
       references: {
@@ -60,7 +60,7 @@ PwBuilding.init(
   }
 )
 
-PwBuilding.belongsTo(PwPortfolio, { foreignKey: 'pw_portfolioID' });
-PwBuilding.hasMany(PwUnit, { foreignKey: 'pw_buildingID' }); 
+PwBuilding.belongsTo(PwPortfolio, { foreignKey: 'pw_portfolioID', targetKey: 'pw_id' });
+// PwBuilding.hasMany(PwUnit, { foreignKey: 'pw_buildingID', sourceKey: 'pw_id' }); 
 
 export default PwBuilding

src/models/pwPortfolio.ts

@@ -1,18 +1,14 @@
 import {
     DataTypes,
     Model,
-    InferAttributes,
-    InferCreationAttributes,
     CreationOptional,
   } from 'sequelize';
-import { sequelize } from '../db/models/index';
+import { sequelize } from './index';
 import { PwPortfolioInterface } from '../shared/interfaces/pwPortfolio.interface';
 import PwBuilding from './pwBuildings';
 import PwUnit from './pwUnits';
 
-class PwPortfolio
-  extends Model<InferAttributes<PwPortfolio>, InferCreationAttributes<PwPortfolio>>
-  implements PwPortfolioInterface
+class PwPortfolio extends Model<PwPortfolioInterface> implements PwPortfolioInterface 
 {
   declare id?: CreationOptional<number>;
   declare name: string;
@@ -50,8 +46,8 @@ PwPortfolio.init(
   }
 );
 
-PwPortfolio.hasMany(PwBuilding, { foreignKey: 'pw_portfolioID' });
-PwPortfolio.hasMany(PwUnit, { foreignKey: 'pw_portfolioID' });
+// PwPortfolio.hasMany(PwBuilding, { foreignKey: 'pw_portfolioID', sourceKey: 'pw_id' });
+// PwPortfolio.hasMany(PwUnit, { foreignKey: 'pw_portfolioID', sourceKey: 'pw_id' });
 
 
 export default PwPortfolio

src/models/pwUnits.ts

@@ -5,7 +5,7 @@ import {
   InferCreationAttributes,
   CreationOptional,
 } from 'sequelize';
-import { sequelize } from '../db/models/index';
+import { sequelize } from './index';
 import PwPortfolio from './pwPortfolio';
 import { PwUnitInterface } from 'shared/interfaces/pwUnits.interface';
 import PwBuilding from './pwBuildings';
@@ -17,8 +17,8 @@ class PwUnit
   declare id?: CreationOptional<number>;
   declare name: string;
   declare pw_id: number;
-  declare pw_portfolioID: number;
-  declare pw_buildingID: number;
+  declare pw_portfolio_id: number;
+  declare pw_building_id: number;
 }
 
 PwUnit.init(
@@ -41,7 +41,7 @@ PwUnit.init(
       allowNull: false,
     }, 
 
-    pw_portfolioID: {
+    pw_portfolio_id: {
       type: DataTypes.INTEGER.UNSIGNED,
       allowNull: false,
       references: {
@@ -50,7 +50,7 @@ PwUnit.init(
       },
     },
 
-    pw_buildingID: {
+    pw_building_id: {
       type: DataTypes.INTEGER.UNSIGNED,
       allowNull: false,
       references: {
@@ -68,8 +68,8 @@ PwUnit.init(
     timestamps: true,
   }
 );
-
-PwUnit.belongsTo(PwPortfolio, { foreignKey: 'pw_portfolioID' });
-PwUnit.belongsTo(PwBuilding, { foreignKey: 'pw_buildingID' });
+console.log(PwPortfolio);
+PwUnit.belongsTo(PwPortfolio, { foreignKey: 'pw_portfolioID', targetKey: 'pw_id' });
+PwUnit.belongsTo(PwBuilding, { foreignKey: 'pw_buildingID', targetKey: 'pw_id' });
 
 export default PwUnit;

src/models/roles.ts

@@ -5,7 +5,7 @@ import {
   InferCreationAttributes,
   CreationOptional,
 } from 'sequelize';
-import { sequelize } from '../db/models/index'; 
+import { sequelize } from './index'; 
 import User from './users';
 import Permission from './permissions';
 import { RoleInterface } from '../shared/interfaces/role.interface';

src/models/settings.ts

@@ -5,7 +5,7 @@ import {
   InferCreationAttributes,
   CreationOptional,
 } from 'sequelize';
-import { sequelize } from '../db/models/index';
+import { sequelize } from './index';
 import { SettingInterface } from '../shared/interfaces/setting.interface';
 
 class Setting extends Model<InferAttributes<Setting>, InferCreationAttributes<Setting>> implements SettingInterface {

src/models/users.ts

@@ -5,7 +5,7 @@ import {
   InferCreationAttributes,
   CreationOptional,
 } from 'sequelize';
-import { sequelize } from '../db/models/index';
+import { sequelize } from './index';
 import Role from './roles'; 
 import { UserInterface } from '../shared/interfaces/user.interface';
 

src/routes/index.ts

@@ -1,12 +1,16 @@
 import express from "express";
 import { fetchVendorsData } from "../controllers/propertyware/vendors.controller";
 import { fetchGLAccountsData } from "../controllers/propertyware/glAccounts.controller";
-import { fetchPortfolioData } from "controllers/propertyware/portfolio.controller";
+import { syncPortfolioData } from "../controllers/propertyware/portfolio.controller";
+import { syncBuildingsData } from "../controllers/propertyware/buildings.controller";
+import { syncUnitsData } from "../controllers/propertyware/units.controller";
 
 const pwRouter = express.Router();
 
 pwRouter.get("/pw/glAccounts", fetchGLAccountsData);
 pwRouter.get("/pw/vendors", fetchVendorsData);
-pwRouter.get("/pw/getPortfolio", fetchPortfolioData);
+pwRouter.get("/pw/syncPortfolio", syncPortfolioData);
+pwRouter.get("/pw/syncBuildings", syncBuildingsData);
+pwRouter.get("/pw/syncUnits", syncUnitsData);
 
 export default pwRouter;

src/shared/interfaces/pwBuilding.interface.ts

@@ -2,5 +2,5 @@ export interface PwBuildingInterface {
     id?: number;
     name: string;
     pw_id: number; 
-    pw_portfolioID: number;
+    pw_portfolio_id: number;
   }

src/shared/interfaces/pwUnits.interface.ts

@@ -2,6 +2,6 @@ export interface PwUnitInterface {
     id?: number;
     name: string;
     pw_id: number; 
-    pw_portfolioID: number;
-    pw_buildingID: number;
+    pw_portfolio_id: number;
+    pw_building_id: number;
   }

src/shared/services/propertyware.service.ts

@@ -13,3 +13,11 @@ export const fetchPortfolio = async (params = []) => {
     const response = await apiClientPW.get(`/portfolios`, { params });
     return response.data;
 };
+export const fetchBuildings = async (params = []) => {
+    const response = await apiClientPW.get(`/buildings`, { params });
+    return response.data;
+};
+export const fetchUnits = async (params = []) => {
+    const response = await apiClientPW.get(`/units`, { params });
+    return response.data;
+};