lms-sync 1.0.75 → 1.0.76

package/apiConnections/mapping.js

@@ -1951,14 +1951,8 @@ const server = {
             const semesterSeq = await Semesters.findAll()
             const acadYearSeq = await AcademicYears.findAll()
 
-            const userMail = await Users.findOne({ where: { email: 'ccci_integrator@gmail.com' } });    
-            const campusDefault = await Campuses.findOne({ where: { name: 'Campus Default' } });     
-            const courseDefault = await Courses.findOne({ where: { name: 'Course Default' } });    
-            const collegeDefault = await Colleges.findOne({ where: { name: 'Colleges Default' } });  
-            const yearDefault = await AcademicYears.findOne({ where: { from: 1799, to: 1800 } }); 
-            const semeDefault = await Semesters.findOne({ where: { code: '1st Semester' }});
-
-
+            const userMail = await Users.findOne({ where: { email: 'ccci_integrator@gmail.com' } });
+            
             let yearDefPayload = {
                 from: 1799,
                 to: 1800,
@@ -1973,6 +1967,16 @@ const server = {
                 }, 
                 defaults: yearDefPayload 
             }); 
+
+            
+            const campusDefault = await Campuses.findOne({ where: { name: 'Campus Default' } });     
+            const courseDefault = await Courses.findOne({ where: { name: 'Course Default' } });    
+            const collegeDefault = await Colleges.findOne({ where: { name: 'Colleges Default' } });  
+            const yearDefault = await AcademicYears.findOne({ where: { from: 1799, to: 1800 } }); 
+            const semeDefault = await Semesters.findOne({ where: { code: '1st Semester' }});
+
+
+          
    
 
             let createdCounter = 0
@@ -2217,21 +2221,6 @@ const server = {
             await db.sequelize.query(`ALTER SEQUENCE ${db_schema}."Sections__id_seq" RESTART WITH ${maxId + 1}`);
             await db.sequelize.query(`DROP FUNCTION IF EXISTS ${db_schema}."pg_temp.testfunc()"`);
 
-             let yearDefPayload = {
-                from: 1799,
-                to: 1800,
-                modifiedById: userMail?._id,
-                createdById: userMail?._id,
-                default: false,
-            }
-            let [yeardef, createdyear] = await AcademicYears.findOrCreate({
-                where: { 
-                    from: yearDefPayload.from,
-                    to: yearDefPayload.to,
-                }, 
-                defaults: yearDefPayload 
-            }); 
-
             const student = (await api.Student()).data;
     
             const subjectApi = await api.Subject();
@@ -2247,9 +2236,28 @@ const server = {
             const acadDeptSeq = await AcademicDepartments.findAll()
 
             const userMail = await Users.findOne({ where: { email: 'ccci_integrator@gmail.com' } });
+
+
+            let yearDefPayload = {
+                from: 1799,
+                to: 1800,
+                modifiedById: userMail?._id,
+                createdById: userMail?._id,
+                default: false,
+            }
+            let [yeardef, createdyear] = await AcademicYears.findOrCreate({
+                where: { 
+                    from: yearDefPayload.from,
+                    to: yearDefPayload.to,
+                }, 
+                defaults: yearDefPayload 
+            }); 
+
+
             const yearDefault = await AcademicYears.findOne({ where: { from: 1799, to: 1800 } }); 
             const semeDefault = await Semesters.findOne({ where: { code: '1st Semester' }});   
   
+
             let createdCounter = 0
             let errorCounter = 0
             let uniqueErrors = new Set()
@@ -2460,7 +2468,20 @@ const server = {
             await db.sequelize.query(`ALTER SEQUENCE ${db_schema}."EnrolledStudents__id_seq" RESTART WITH ${maxId + 1}`);
             await db.sequelize.query(`DROP FUNCTION IF EXISTS ${db_schema}."pg_temp.testfunc()"`);
 
-             let yearDefPayload = {
+            const studentApi = (await api.Student()).data
+            const instructorApi = await api.Instructor()
+
+            const studentSeq = await Students.findAll()
+            const courseSeq = await Courses.findAll()
+            const campusSeq = await Campuses.findAll()
+            const acadYearSeq = await AcademicYears.findAll()
+            const semesterSeq = await Semesters.findAll()
+            const sectionSeq = await Sections.findAll()
+            const instructorSeq = await Instructors.findAll()
+
+            const userMail = await Users.findOne({ where: { email: 'ccci_integrator@gmail.com' } });     
+            
+            let yearDefPayload = {
                 from: 1799,
                 to: 1800,
                 modifiedById: userMail?._id,
@@ -2475,20 +2496,9 @@ const server = {
                 defaults: yearDefPayload 
             }); 
 
-            const studentApi = (await api.Student()).data
-            const instructorApi = await api.Instructor()
-
-            const studentSeq = await Students.findAll()
-            const courseSeq = await Courses.findAll()
-            const campusSeq = await Campuses.findAll()
-            const acadYearSeq = await AcademicYears.findAll()
-            const semesterSeq = await Semesters.findAll()
-            const sectionSeq = await Sections.findAll()
-            const instructorSeq = await Instructors.findAll()
-
-            const userMail = await Users.findOne({ where: { email: 'ccci_integrator@gmail.com' } });         
             const yearDefault = await AcademicYears.findOne({ where: { from: 1799, to: 1800 } }); 
             const semeDefault = await Semesters.findOne({ where: { code: '1st Semester' }});   
+            
 
             let createdCounter = 0
             let errorCounter = 0

package/package.json

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