Merge pull request tekdi#31 from ManojNathIC/main

de-duplication fixes
ManojNathIC · Dec 16, 2024 · e2a2e97 · e2a2e97
2 parents b34fe72 + 27f53ec
commit e2a2e97
Show file tree

Hide file tree

Showing 10 changed files with 174 additions and 207 deletions.
diff --git a/schemas/Examiner.json b/schemas/Examiner.json
@@ -1,34 +1,35 @@
 {
-	"$schema": "http://json-schema.org/draft-07/schema",
-	"type": "object",
-	"properties": { "Examiner": { "$ref": "#/definitions/Examiner" } },
-	"required": ["Examiner"],
-	"title": "Examiner",
-	"definitions": {
-		"Examiner": {
-			"$id": "#/properties/Examiner",
-			"type": "object",
-			"title": "Examinerschema",
-			"required": ["name", "email", "phoneNumber", "password"],
-			"uniqueIndexFields": ["email"],
-			"properties": {
-                "name": {"type": "string", "title": "Name"},
-                "email": { "type": "string", "title": "Email" },
-				"phoneNumber": { "type": "string", "title": "Phone Number" },
-				"status": { "type": "string", "title": "Status" },
-				"password": { "type": "string", "minLength": 8, "title": "Password" }
-			}
-		}
-	},
-	"_osConfig": {
-		"ownershipAttributes": [
-			{
-				"email": "/email",
-				"mobile": "/phoneNumber",
-				"userId": "/email",
-				"password": "/password"
-			}
-		],
-		"inviteRoles": ["anonymous"]
-	}
-}
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "type": "object",
+  "properties": { "Examiner": { "$ref": "#/definitions/Examiner" } },
+  "required": ["Examiner"],
+  "title": "Examiner",
+  "definitions": {
+    "Examiner": {
+      "$id": "#/properties/Examiner",
+      "type": "object",
+      "title": "Examinerschema",
+      "required": ["name", "email", "phoneNumber", "password"],
+      "uniqueIndexFields": ["email"],
+      "properties": {
+        "name": { "type": "string", "title": "Name" },
+        "email": { "type": "string", "title": "Email" },
+        "phoneNumber": { "type": "string", "title": "Phone Number" },
+        "status": { "type": "string", "title": "Status" },
+        "password": { "type": "string", "minLength": 8, "title": "Password" }
+      }
+    }
+  },
+  "_osConfig": {
+    "ownershipAttributes": [
+      {
+        "email": "/email",
+        "mobile": "/phoneNumber",
+        "userId": "/email",
+        "password": "/password"
+      }
+    ],
+    "inviteRoles": ["anonymous"],
+    "uniqueIndexFields": ["email"]
+  }
+}
diff --git a/schemas/Inspector.json b/schemas/Inspector.json
@@ -1,34 +1,34 @@
 {
-	"$schema": "http://json-schema.org/draft-07/schema",
-	"type": "object",
-	"properties": { "Inspector": { "$ref": "#/definitions/Inspector" } },
-	"required": ["Inspector"],
-	"title": "Inspector",
-	"definitions": {
-		"Inspector": {
-			"$id": "#/properties/Inspector",
-			"type": "object",
-			"title": "Inspectorschema",
-			"required": ["name", "email", "phoneNumber", "password"],
-			"uniqueIndexFields": ["email"],
-			"properties": {
-                "name": {"type": "string", "title": "Name"},
-                "email": { "type": "string", "title": "Email" },
-				"phoneNumber": { "type": "string", "title": "Phone Number" },
-				"status": { "type": "string", "title": "Status" },
-				"password": { "type": "string", "minLength": 8, "title": "Password" }
-			}
-		}
-	},
-	"_osConfig": {
-		"ownershipAttributes": [
-			{
-				"email": "/email",
-				"mobile": "/phoneNumber",
-				"userId": "/email",
-				"password": "/password"
-			}
-		],
-		"inviteRoles": ["anonymous"]
-	}
-}
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "type": "object",
+  "properties": { "Inspector": { "$ref": "#/definitions/Inspector" } },
+  "required": ["Inspector"],
+  "title": "Inspector",
+  "definitions": {
+    "Inspector": {
+      "$id": "#/properties/Inspector",
+      "type": "object",
+      "title": "Inspectorschema",
+      "required": ["name", "email", "phoneNumber", "password"],
+      "properties": {
+        "name": { "type": "string", "title": "Name" },
+        "email": { "type": "string", "title": "Email" },
+        "phoneNumber": { "type": "string", "title": "Phone Number" },
+        "status": { "type": "string", "title": "Status" },
+        "password": { "type": "string", "minLength": 8, "title": "Password" }
+      }
+    }
+  },
+  "_osConfig": {
+    "ownershipAttributes": [
+      {
+        "email": "/email",
+        "mobile": "/phoneNumber",
+        "userId": "/email",
+        "password": "/password"
+      }
+    ],
+    "inviteRoles": ["anonymous"],
+    "uniqueIndexFields": ["email"]
+  }
+}
diff --git a/schemas/Student.json b/schemas/Student.json
@@ -17,8 +17,9 @@
         "school",
         "password"
       ],
-      "uniqueIndexFields": ["email", "nin"],
+
       "properties": {
+        "uniqueId": { "type": "string", "title": "Student unique Id" },
         "studentId": { "type": "string", "title": "Student Id" },
         "studentJssId": {
           "type": "string",
@@ -50,6 +51,7 @@
         "password": "/password"
       }
     ],
-    "inviteRoles": ["anonymous"]
+    "inviteRoles": ["anonymous"],
+    "uniqueIndexFields": ["uniqueId"]
   }
 }
diff --git a/schemas/casteCertificate.json b/schemas/casteCertificate.json
@@ -22,8 +22,8 @@
         "dateOfIssuance",
         "certificateNumber"
       ],
-      "uniqueIndexFields": ["studentId"],
       "properties": {
+        "uniqueId": { "type": "string", "title": "Student unique Id" },
         "studentId": {
           "type": "string",
           "title": "Student Identifier"
@@ -39,7 +39,7 @@
         "relationWithApplicant": {
           "type": "string",
           "title": "Relation with Applicant"
-        },      
+        },
         "firstName": {
           "type": "string",
           "title": "First Name"
@@ -136,6 +136,7 @@
     }
   },
   "_osConfig": {
-    "inviteRoles": ["anonymous"]
+    "inviteRoles": ["anonymous"],
+    "uniqueIndexFields": ["uniqueId"]
   }
 }
diff --git a/schemas/marksheet.json b/schemas/marksheet.json
@@ -7,31 +7,34 @@
     }
   },
   "required": ["marksheet"],
-  "title": "Marksheet",
+  "title": "marksheet",
   "definitions": {
     "marksheet": {
       "$id": "#/properties/marksheet",
       "type": "object",
       "title": "marksheetSchema",
       "required": [
+        "uniqueId",
         "studentId",
         "firstName",
-        "schoolUniqueCode",
+        "schoolId",
         "schoolName",
         "examDate",
         "academicYear",
         "issuerName"
       ],
-      "uniqueIndexFields": ["studentId"],
+
       "properties": {
         "studentId": {
           "type": "string",
           "title": "Student Identifier"
         },
-        "SchoolId": {
+        "uniqueId": {
           "type": "string",
-          "title": "School Identifier"
+          "title": "Unique ID",
+          "unique": true
         },
+
         "firstName": {
           "type": "string",
           "title": "First Name"
@@ -44,7 +47,7 @@
           "type": "string",
           "title": "Last Name"
         },
-        "schoolUniqueCode": {
+        "schoolId": {
           "type": "string",
           "title": "School Identifier"
         },
@@ -96,6 +99,10 @@
           "type": "string",
           "title": "Name of Issuer"
         },
+        "issuanceDate": {
+          "type": "string",
+          "title": "Issuance Date"
+        },
         "certificateId": {
           "type": "string",
           "title": "Certificate Id"
@@ -108,6 +115,7 @@
     }
   },
   "_osConfig": {
-    "inviteRoles": ["anonymous"]
+    "inviteRoles": ["anonymous"],
+    "uniqueIndexFields": ["uniqueId"]
   }
 }
diff --git a/src/Helper/transformers.ts b/src/Helper/transformers.ts
@@ -53,6 +53,9 @@ export const tenMarksheetTransformer = (data) => {
 export const marksheet = (data) => {
   return data?.map((record) => {
     return {
+      uniqueId: `${record.schoolId?.trim() || ''}-${
+        record.studentUniqueId?.trim() || ''
+      }-${record.class?.trim() || ''}`,
       studentId: record.studentUniqueId,
       firstName: record.firstName,
       middleName: record.middleName,
@@ -85,6 +88,9 @@ export const marksheet = (data) => {
 export const enrollmentCertificate = (data) => {
   return data.map((record) => {
     return {
+      uniqueId: `${record.schoolId?.trim() || ''}-${
+        record.studentUniqueId?.trim() || ''
+      }-${record.class?.trim() || ''}`,
       studentId: record.studentUniqueId,
       schoolId: record.schoolId,
       firstName: record.firstName,
@@ -123,6 +129,9 @@ export const enrollmentCertificate = (data) => {
 export const casteCertificate = (data) => {
   return data.map((record) => {
     return {
+      uniqueId: `${record.schoolId?.trim() || ''}-${
+        record.studentUniqueId?.trim() || ''
+      }`,
       familyLeaderBhamashahNumber: record.familyLeaderBhamashahNumber,
       relationWithApplicant: record.relationWithApplicant,
       studentId: record.studentUniqueId,
@@ -174,6 +183,9 @@ export const casteCertificate = (data) => {
 export const sportsParticipationCertificate = (data) => {
   return data.map((record) => {
     return {
+      uniqueId: `${record.schoolId?.trim() || ''}-${
+        record.studentUniqueId?.trim() || ''
+      }-${record.class?.trim() || ''}`,
       studentId: record.studentUniqueId,
       schoolId: record.schoolId,
       firstName: record.firstName,
@@ -224,6 +236,9 @@ export const sportsParticipationCertificate = (data) => {
 export const janAadharCertificate = (data) => {
   return data.map((record) => {
     return {
+      uniqueId: `${record.schoolId?.trim() || ''}-${
+        record.studentUniqueId?.trim() || ''
+      }`,
       studentId: record.studentUniqueId,
       schoolId: record.schoolId,
       schoolName: record.schoolName,
@@ -260,6 +275,9 @@ export const janAadharCertificate = (data) => {
 export const incomeCertificate = (data) => {
   return data?.map((record) => {
     return {
+      uniqueId: `${record.schoolId?.trim() || ''}-${
+        record.studentUniqueId?.trim() || ''
+      }`,
       studentId: record.studentUniqueId,
       schoolId: record.schoolId,
       schoolName: record.schoolName,

diff --git a/src/examiner/examiner.controller.ts b/src/examiner/examiner.controller.ts
@@ -60,6 +60,7 @@ export class ExaminerController {
         })
         .on('end', async () => {
           const data = await this.examinerService.uploadResult(
+            authToken,
             results,
             documentType,
           );