lms-sync 1.0.48 → 1.0.49

package/apiConnections/mapping.js

@@ -684,6 +684,9 @@ const server = {
 
                     let employeeFind = employeeSeq.find(emps => emps.employeeNumber === _instructor?.faculty_id)
                     let userFind = userSeq.find(eus => eus._id === employeeFind?.userId)
+                    let _userFind = userSeq.find(e => e.firstName === _instructor?.first_name && e.middleName === _instructor?.middle_name && e.lastName === _instructor?.last_name)
+
+                    // console.log('userFind :>> ', userFind);
 
                     if(!employeeFind){}
                     if(!userFind){}
@@ -723,7 +726,9 @@ const server = {
                     let departmentId =  _acadDepartment?._id??departmentDefault?._id
                     let campusId =  campusMap?._id??_campusDefault?._id
                     let employeeId = employeeFind?._id??null
-                    let userId = userFind?._id??null
+                    let userId = userFind?._id??_userFind?._id
+
+                    // console.log('userId :>> ', userId);
 
                     if(uEmail.has(email) && uPass.has(password) && uTPass.has(temporaryPassword) && uULname.has(lastName) && uUFname.has(firstName) && uUMname.has(middleName) && uScopes.has(adminScopes)){
                         const errorMsg = `Duplicate Payload Found: [${email} - ${password} ${temporaryPassword}] - ${lastName}, ${firstName} ${middleName} ${adminScopes}`
@@ -803,7 +808,7 @@ const server = {
                             migratedTable,
                             // referenceId,
                             isMigrated,
-                            userId,
+                            userId: userId || null,
                             employeeId,
                         })
                     }
@@ -825,11 +830,12 @@ const server = {
 
             if (newInstructor.length > 0) {
                 // Associate userIds with new instructors
-                newInstructor = newInstructor.map((inst, index) => ({
-                    ...inst,
-                    userId: userIds[index]
-                }));
-    
+                // if(!newInstructor.userId){
+                //     newInstructor = newInstructor.map((inst, index) => ({
+                //         ...inst,
+                //         userId: userIds[index]
+                //     }));
+                // }
                 await Instructors.bulkCreate(newInstructor);
                 createdCounter += newInstructor.length;
     
@@ -837,26 +843,15 @@ const server = {
                     logger.info(`${index + 1}/${index + 1}: New Instructor Record Created: [${inst.employeeNumber}] - ${inst.lastName}, ${inst.firstName} ${inst.middleName} [ departmentId: ${inst.departmentId}, campusId: ${inst.campusId}]`);
                 });
             }
-
-
-            // if (newInstructor.length > 0) {
-                
-            //     await Instructors.bulkCreate(newInstructor)
-            //     createdCounter += newInstructor.length
-    
-            //     newInstructor.forEach((inst, index) => {
-            //         logger.info(`${index + 1}/${index + 1}: New Instructor Record Created: [${inst.employeeNumber}] - ${inst.lastName}, ${inst.firstName} ${inst.middleName} [ departmentId: ${inst.departmentId}, campusId: ${inst.campusId}]`)
-            //     });
-
-            // }
+            
 
 
             console.log("");
             console.log("########################################################")
             console.log("")
-            logger.info('User Instructors Data Creation Completed');
-            logger.info(`Total Successful User Instructors Records Created: ${createdCounter}/${createdCounter}`);
-            logger.info(`Total User Instructors Error Records: ${errorCounter}/${errorCounter}`);
+            logger.info('Instructors Data Migration Completed');
+            logger.info(`Total Successful Instructors Records Created: ${createdCounter}/${createdCounter}`);
+            logger.info(`Total Existing Instructors Records: ${errorCounter}/${errorCounter}`);
             logger.info(`Total Records: ${createdCounter + errorCounter}`);
 
             console.log("")
@@ -1671,6 +1666,9 @@ const server = {
 
     async Schedule(){
         try {
+
+            await db.sequelize.query('DROP FUNCTION IF EXISTS pg_temp.testfunc()');
+
             console.log("");
             console.log("########################################################")
             console.log("                       Schedules Migration ")
@@ -1682,7 +1680,8 @@ const server = {
             let maxId = maxIds|| 0;
             await db.sequelize.query(`CREATE SEQUENCE IF NOT EXISTS ${db_schema}."Schedules__id_seq"`);
             await db.sequelize.query(`ALTER SEQUENCE ${db_schema}."Schedules__id_seq" RESTART WITH ${maxId + 1}`);
-    
+            await db.sequelize.query(`DROP FUNCTION IF EXISTS ${db_schema}."pg_temp.testfunc()"`);
+
             const scheduleApi = await api.Schedule()
             const userMail = await Users.findOne({ where: { email: 'ccci_integrator@gmail.com' } });    
                     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lms-sync",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "Migration App for MSC LMS",
   "main": "index.js",
   "scripts": {