@eeplatform/basic-edu 1.4.0 → 1.4.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.4.2
+
+### Patch Changes
+
+- e84952a: Parse createdBy, updatedBy, and deletedBy to ObjectId
+
+## 1.4.1
+
+### Patch Changes
+
+- 944df9d: Add count reset in enrollment acceptance business logic
+
 ## 1.4.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -105,9 +105,9 @@ type TLearner = {
     createdAt?: Date | string;
     updatedAt?: Date | string;
     deletedAt?: Date | string;
-    createdBy?: string;
-    updatedBy?: string;
-    deletedBy?: string;
+    createdBy?: string | ObjectId;
+    updatedBy?: string | ObjectId;
+    deletedBy?: string | ObjectId;
 };
 type TLearnerInfo = {
     psaBirthCertificateNo?: string;
@@ -195,9 +195,9 @@ declare function MLearner(value: TLearner): {
     createdAt: string | Date;
     updatedAt: string | Date;
     deletedAt: string | Date;
-    createdBy: string;
-    updatedBy: string;
-    deletedBy: string;
+    createdBy: string | ObjectId;
+    updatedBy: string | ObjectId;
+    deletedBy: string | ObjectId;
 };
 
 declare function useEnrollmentRepo(): {
@@ -750,6 +750,7 @@ declare function useBasicEduCountRepo(): {
     getById: (_id: string | ObjectId, status?: string) => Promise<TBasicEduCount | null>;
     incrementById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     getByName: (name: string, session?: ClientSession) => Promise<TBasicEduCount | null>;
+    resetById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
 
 export { MAsset, MCurriculum, MGradeLevel, MLearner, MPlantilla, MStockCard, TAddress, TAddressInformation, TAsset, TBasicEduCount, TCurriculum, TCurriculumSubject, TDivision, TGradeLevel, TLearner, TLearnerInfo, TLearningModality, TParentGuardianInfo, TPersonContact, TPlantilla, TRegion, TReturningLearnerInfo, TSchool, TSeniorHighInformation, TStockCard, modelBasicEduCount, modelDivision, modelRegion, modelSchool, schemaAsset, schemaAssetUpdateOption, schemaBasicEduCount, schemaCurriculum, schemaDivision, schemaDivisionUpdate, schemaEnrollment, schemaGradeLevel, schemaPlantilla, schemaRegion, schemaSchool, schemaSchoolUpdate, schemaStockCard, schemaUpdateStatus, useAssetController, useAssetRepo, useBasicEduCountRepo, useCurriculumController, useCurriculumRepo, useDivisionController, useDivisionRepo, useDivisionService, useEnrollmentController, useEnrollmentRepo, useEnrollmentService, useGradeLevelController, useGradeLevelRepo, useLearnerController, useLearnerRepo, usePlantillaController, usePlantillaRepo, usePlantillaService, useRegionController, useRegionRepo, useSchoolController, useSchoolRepo, useSchoolService, useStockCardController, useStockCardRepository, useStockCardService };

package/dist/index.js

@@ -1986,6 +1986,27 @@ function MLearner(value) {
       throw new import_nodejs_utils4.BadRequestError("Invalid school format");
     }
   }
+  if (value.createdBy && typeof value.createdBy === "string") {
+    try {
+      value.createdBy = new import_mongodb3.ObjectId(value.createdBy);
+    } catch (error2) {
+      throw new import_nodejs_utils4.BadRequestError("Invalid createdBy format");
+    }
+  }
+  if (value.updatedBy && typeof value.updatedBy === "string") {
+    try {
+      value.updatedBy = new import_mongodb3.ObjectId(value.updatedBy);
+    } catch (error2) {
+      throw new import_nodejs_utils4.BadRequestError("Invalid updatedBy format");
+    }
+  }
+  if (value.deletedBy && typeof value.deletedBy === "string") {
+    try {
+      value.deletedBy = new import_mongodb3.ObjectId(value.deletedBy);
+    } catch (error2) {
+      throw new import_nodejs_utils4.BadRequestError("Invalid deletedBy format");
+    }
+  }
   return {
     _id: value._id ?? void 0,
     region: value.region,
@@ -2814,12 +2835,31 @@ function useBasicEduCountRepo() {
       throw new Error("Failed to increment counter status.");
     }
   }
+  async function resetById(_id, session) {
+    try {
+      _id = new import_mongodb6.ObjectId(_id);
+    } catch (error) {
+      throw new import_nodejs_utils9.BadRequestError("Invalid ID.");
+    }
+    try {
+      const result = await collection.updateOne(
+        { _id },
+        { $set: { updatedAt: /* @__PURE__ */ new Date(), count: 0 } },
+        { session }
+      );
+      delCachedData();
+      return result;
+    } catch (error) {
+      throw new Error("Failed to reset counter to zero.");
+    }
+  }
   return {
     createIndexes,
     add,
     getById,
     incrementById,
-    getByName
+    getByName,
+    resetById
   };
 }
 
@@ -2895,7 +2935,7 @@ function useEnrollmentService() {
     }
   }
   const { add: addLearner } = useLearnerRepo();
-  const { getByName, incrementById } = useBasicEduCountRepo();
+  const { getByName, incrementById, resetById } = useBasicEduCountRepo();
   function padNumber(num) {
     const str = String(num);
     const pad = 4 - str.length;
@@ -2939,10 +2979,20 @@ function useEnrollmentService() {
               "Failed to retrieve enrollment counter"
             );
           }
+          const counterId = String(counter._id);
+          if (counter.updatedAt) {
+            const countUpdatedAtYear = new Date(
+              counter.updatedAt
+            ).getFullYear();
+            const currentYear = (/* @__PURE__ */ new Date()).getFullYear();
+            if (countUpdatedAtYear < currentYear) {
+              counter.count = 0;
+              await resetById(counterId, session);
+            }
+          }
           const newCount = padNumber(counter.count + 1);
           const lrn = `${enrollment.schoolId}-${(/* @__PURE__ */ new Date()).getFullYear().toString().slice(2, 4)}-${newCount}`;
           enrollment.learnerInfo.lrn = lrn;
-          const counterId = String(counter._id);
           await incrementById(counterId, session);
         }
         await addLearner(enrollment, session);