lms-sync 1.0.63 → 1.0.65

package/apiConnections/mapping.js

@@ -57,6 +57,8 @@ const server = {
             
             await db.sequelize.query(`DROP FUNCTION IF EXISTS ${db_schema}."pg_temp.testfunc()"`);
 
+
+
             let userDefPayload = {
                 email: 'ccci_integrator@gmail.com',
                 password: '$2a$12$Q.h3Q9IN6vsIxGBa/EgfOOABeXTcwxt4t9cu4nqAK.nczGRRtZJUS',
@@ -72,12 +74,23 @@ const server = {
                 defaults: userDefPayload 
             }); 
 
-            // if (createdUser){
-            //     logger.info(`Created Migration User :>> ${userDefault.email}`);
-            // }
-
             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 
+            }); 
+
             let semesterData = [
                 {
                     code: '1st Semester',
@@ -1805,6 +1818,21 @@ const server = {
             await db.sequelize.query(`ALTER SEQUENCE ${db_schema}."Students__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 studentApi = await api.Student()
 
             const campusSeq = await Campuses.findAll()
@@ -1816,7 +1844,10 @@ const server = {
             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 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
             let errorCounter = 0
@@ -1870,6 +1901,10 @@ const server = {
                     let _semester = semesterSeq.find(sem => sem.code === semester)
                     let _acadYear = acadYearSeq.find(yr => yr.from === parseInt(yearsFrom) && yr.to === parseInt(yearsTo))
 
+
+                    let defSem = semeDefault?._id
+                    let defYear = yearDefault?._id
+
                     let studentNumber = _student?.student_number
                     let firstName = _student?.first_name
                     let lastName = _student?.last_name
@@ -1963,8 +1998,8 @@ const server = {
                             courseId: _course?._id??courseDefault?._id,
                             campusId: _campus?._id??campusDefault?._id,
                             collegeId: _college?._id??collegeDefault?._id,
-                            admittedYearId: _acadYear?._id ?? null,
-                            admittedSemId: _semester?._id ?? null,
+                            admittedYearId: defYear,
+                            admittedSemId: defSem,
                             modifiedById,
                             createdById,
                             migratedAt,
@@ -2053,6 +2088,21 @@ 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();
@@ -2068,6 +2118,8 @@ const server = {
             const acadDeptSeq = await AcademicDepartments.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
@@ -2136,6 +2188,9 @@ const server = {
                         let _semester = semesterSeq.find(sem => sem.code === semester)
                         let _acadYear = acadYearSeq.find(yr => yr.from === parseInt(yearsFrom) && yr.to === parseInt(yearsTo))
 
+                        let defSem = semeDefault?._id
+                        let defYear = yearDefault?._id
+
                         let modifiedById = userMail?._id;
                         let createdById = userMail?._id;
 
@@ -2271,6 +2326,21 @@ 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 = {
+                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 studentApi = (await api.Student()).data
             const instructorApi = await api.Instructor()
 
@@ -2282,7 +2352,9 @@ const server = {
             const sectionSeq = await Sections.findAll()
             const instructorSeq = await Instructors.findAll()
 
-            const userMail = await Users.findOne({ where: { email: 'ccci_integrator@gmail.com' } });            
+            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
@@ -2302,13 +2374,18 @@ const server = {
                     let _students = studentApi[i].subjects_enrolled
 
                     let fromPrompts = await Picked()
-                    
+
+                    //from prompts      
                     let semester = fromPrompts.semester
                     let yearsFrom = fromPrompts.yearFrom
                     let yearsTo = fromPrompts.yearTo
+
                     let _semester = semesterSeq.find(sem => sem.code === semester)
                     let _acadYear = acadYearSeq.find(yr => yr.from === parseInt(yearsFrom) && yr.to === parseInt(yearsTo))
 
+                    let defSem = semeDefault?._id
+                    let defYear = yearDefault?._id
+
 
                     let modifiedById = userMail?._id;
                     let createdById = userMail?._id;
@@ -2412,8 +2489,8 @@ const server = {
                                 instructorId: _instructor?._id??null,
                                 sectionId: _section?._id??null,
                                 campusId: campus?._id,
-                                academicYearId: _acadYear?._id,
-                                semesterId: _semester?._id,
+                                academicYearId: defYear,
+                                semesterId: defSem,
                                 finalGrade: finalG,
                                 graded,
                                 remarks,

package/package.json

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