@eeplatform/basic-edu 1.10.35 → 1.10.37

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.10.37
+
+### Patch Changes
+
+- 84cc4a1: Fix enrollent and screening program
+
+## 1.10.36
+
+### Patch Changes
+
+- 57a23b0: Fix enrollment status update validation
+
 ## 1.10.35
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1695,6 +1695,7 @@ type TProgramScreening = {
 declare const statusesProgramScreening: string[];
 declare const schemaProgramScreening: Joi.ObjectSchema<any>;
 declare const schemaProgramScreeningUpdate: Joi.ObjectSchema<any>;
+declare const schemaProgramScreeningUpdateStatus: Joi.ObjectSchema<any>;
 declare function modelProgramScreening(value: TProgramScreening): TProgramScreening;
 
 declare function useProgramScreeningRepo(): {
@@ -1964,4 +1965,4 @@ declare function useStrandController(): {
     deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
-export { MAsset, MBuilding, MBuildingUnit, MCurriculum, MGradeLevel, MLearner, MPersonnel, MPlantilla, MStockCard, TAddress, TAddressInformation, TAsset, TBasicEduCount, TBlockTime, TBuilding, TBuildingUnit, TCurriculum, TDivision, TEnrollment, TGradeLevel, TKindergartenDomain, TKindergartenRoutine, TLearner, TLearnerInfo, TLearningModality, TParentGuardianInfo, TPersonContact, TPersonnel, TPlantilla, TProgram, TProgramScreening, TRegion, TReturningLearnerInfo, TSchool, TSection, TSectionPreset, TSectionStudent, TSectionSubject, TSeniorHighInformation, TStockCard, TStrand, TSubject, TTeachingLoad, TTeachingLoadSlot, TTrack, allowedSectionStudentStatuses, modelBasicEduCount, modelDivision, modelKindergartenDomain, modelKindergartenRoutine, modelProgram, modelProgramScreening, modelRegion, modelSchool, modelSection, modelSectionPreset, modelSectionStudent, modelSectionSubject, modelStrand, modelSubject, modelTeachingLoad, modelTeachingLoadSlot, modelTrack, schemaAsset, schemaAssetUpdateOption, schemaBasicEduCount, schemaBuilding, schemaBuildingUnit, schemaCurriculum, schemaDivision, schemaDivisionUpdate, schemaEnrollment, schemaGenerateSections, schemaGradeLevel, schemaKindergartenDomain, schemaKindergartenRoutine, schemaKindergartenRoutineUpdate, schemaPersonnel, schemaPlantilla, schemaProgram, schemaProgramScreening, schemaProgramScreeningUpdate, schemaProgramUpdate, schemaRegion, schemaSchool, schemaSchoolUpdate, schemaSection, schemaSectionPreset, schemaSectionStudent, schemaSectionSubject, schemaSectionSubjectSetup, schemaStockCard, schemaStrand, schemaSubject, schemaSubjectAdd, schemaTeachingLoad, schemaTeachingLoadSlot, schemaTrack, schemaUpdateOptions, schemaUpdateStatus, statusesProgramScreening, useAssetController, useAssetRepo, useBasicEduCountRepo, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCurriculumController, useCurriculumRepo, useDivisionController, useDivisionRepo, useDivisionService, useEnrollmentController, useEnrollmentRepo, useEnrollmentService, useGradeLevelController, useGradeLevelRepo, useKindergartenDomainController, useKindergartenDomainRepo, useKindergartenDomainService, useKindergartenRoutineController, useKindergartenRoutineRepo, useLearnerController, useLearnerRepo, usePersonnelController, usePersonnelRepo, usePlantillaController, usePlantillaRepo, usePlantillaService, useProgramController, useProgramRepo, useProgramScreeningController, useProgramScreeningRepo, useRegionController, useRegionRepo, useSchoolController, useSchoolRepo, useSchoolService, useSectionController, useSectionPresetController, useSectionPresetRepo, useSectionRepo, useSectionStudentController, useSectionStudentRepo, useSectionSubjectController, useSectionSubjectRepo, useSectionSubjectService, useStockCardController, useStockCardRepository, useStockCardService, useStrandController, useStrandRepo, useSubjectController, useSubjectRepo, useSubjectService, useTeachingLoadController, useTeachingLoadRepo, useTeachingLoadSlotController, useTeachingLoadSlotRepo, useTrackController, useTrackRepo, useTrackService };
+export { MAsset, MBuilding, MBuildingUnit, MCurriculum, MGradeLevel, MLearner, MPersonnel, MPlantilla, MStockCard, TAddress, TAddressInformation, TAsset, TBasicEduCount, TBlockTime, TBuilding, TBuildingUnit, TCurriculum, TDivision, TEnrollment, TGradeLevel, TKindergartenDomain, TKindergartenRoutine, TLearner, TLearnerInfo, TLearningModality, TParentGuardianInfo, TPersonContact, TPersonnel, TPlantilla, TProgram, TProgramScreening, TRegion, TReturningLearnerInfo, TSchool, TSection, TSectionPreset, TSectionStudent, TSectionSubject, TSeniorHighInformation, TStockCard, TStrand, TSubject, TTeachingLoad, TTeachingLoadSlot, TTrack, allowedSectionStudentStatuses, modelBasicEduCount, modelDivision, modelKindergartenDomain, modelKindergartenRoutine, modelProgram, modelProgramScreening, modelRegion, modelSchool, modelSection, modelSectionPreset, modelSectionStudent, modelSectionSubject, modelStrand, modelSubject, modelTeachingLoad, modelTeachingLoadSlot, modelTrack, schemaAsset, schemaAssetUpdateOption, schemaBasicEduCount, schemaBuilding, schemaBuildingUnit, schemaCurriculum, schemaDivision, schemaDivisionUpdate, schemaEnrollment, schemaGenerateSections, schemaGradeLevel, schemaKindergartenDomain, schemaKindergartenRoutine, schemaKindergartenRoutineUpdate, schemaPersonnel, schemaPlantilla, schemaProgram, schemaProgramScreening, schemaProgramScreeningUpdate, schemaProgramScreeningUpdateStatus, schemaProgramUpdate, schemaRegion, schemaSchool, schemaSchoolUpdate, schemaSection, schemaSectionPreset, schemaSectionStudent, schemaSectionSubject, schemaSectionSubjectSetup, schemaStockCard, schemaStrand, schemaSubject, schemaSubjectAdd, schemaTeachingLoad, schemaTeachingLoadSlot, schemaTrack, schemaUpdateOptions, schemaUpdateStatus, statusesProgramScreening, useAssetController, useAssetRepo, useBasicEduCountRepo, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCurriculumController, useCurriculumRepo, useDivisionController, useDivisionRepo, useDivisionService, useEnrollmentController, useEnrollmentRepo, useEnrollmentService, useGradeLevelController, useGradeLevelRepo, useKindergartenDomainController, useKindergartenDomainRepo, useKindergartenDomainService, useKindergartenRoutineController, useKindergartenRoutineRepo, useLearnerController, useLearnerRepo, usePersonnelController, usePersonnelRepo, usePlantillaController, usePlantillaRepo, usePlantillaService, useProgramController, useProgramRepo, useProgramScreeningController, useProgramScreeningRepo, useRegionController, useRegionRepo, useSchoolController, useSchoolRepo, useSchoolService, useSectionController, useSectionPresetController, useSectionPresetRepo, useSectionRepo, useSectionStudentController, useSectionStudentRepo, useSectionSubjectController, useSectionSubjectRepo, useSectionSubjectService, useStockCardController, useStockCardRepository, useStockCardService, useStrandController, useStrandRepo, useSubjectController, useSubjectRepo, useSubjectService, useTeachingLoadController, useTeachingLoadRepo, useTeachingLoadSlotController, useTeachingLoadSlotRepo, useTrackController, useTrackRepo, useTrackService };

package/dist/index.js

@@ -1389,6 +1389,7 @@ __export(src_exports, {
   schemaProgram: () => schemaProgram,
   schemaProgramScreening: () => schemaProgramScreening,
   schemaProgramScreeningUpdate: () => schemaProgramScreeningUpdate,
+  schemaProgramScreeningUpdateStatus: () => schemaProgramScreeningUpdateStatus,
   schemaProgramUpdate: () => schemaProgramUpdate,
   schemaRegion: () => schemaRegion,
   schemaSchool: () => schemaSchool,
@@ -3106,7 +3107,7 @@ var learnerInfoSchema = import_joi5.default.object({
 });
 var schemaUpdateStatus = import_joi5.default.object({
   _id: import_joi5.default.string().hex().length(24).required(),
-  status: import_joi5.default.string().valid("pending", "accepted", "rejected", "cancelled").required()
+  status: import_joi5.default.string().valid("screening", "pending", "accepted", "rejected", "cancelled").required()
 });
 var gradeLevels = [
   "kindergarten",
@@ -3150,7 +3151,7 @@ var schemaEnrollment = import_joi5.default.object({
   // Added to match frontend
   specialProgramMajor: import_joi5.default.string().optional().allow("", null),
   // Added to match frontend
-  gwa: import_joi5.default.number().optional().allow(null, 0),
+  gwa: import_joi5.default.number().max(100).optional().allow(null, 0),
   subjects: import_joi5.default.array().items(
     import_joi5.default.object({
       title: import_joi5.default.string().max(100).required(),
@@ -4102,7 +4103,7 @@ var statusesProgramScreening = [
   "passed",
   "failed",
   "reclassified",
-  "withdrawn"
+  "cancelled"
 ];
 var schemaProgramScreening = import_joi9.default.object({
   _id: import_joi9.default.string().hex().optional().allow(null, ""),
@@ -4133,6 +4134,10 @@ var schemaProgramScreeningUpdate = import_joi9.default.object({
   specialProgramName: import_joi9.default.string().optional().allow("", null),
   status: import_joi9.default.string().valid("pending", "pass", "failed").optional().allow("", null)
 });
+var schemaProgramScreeningUpdateStatus = import_joi9.default.object({
+  _id: import_joi9.default.string().hex().length(24).required(),
+  status: import_joi9.default.string().valid("passed", "failed", "reclassified").required()
+});
 function modelProgramScreening(value) {
   const { error } = schemaProgramScreening.validate(value);
   if (error) {
@@ -4589,19 +4594,26 @@ function useProgramScreeningService() {
   const { updateStatusById: updateEnrollmentStatusById, removeProgramById } = useEnrollmentRepo();
   const { updateFieldById, getById: getProgramScreeningById } = useProgramScreeningRepo();
   async function updateStatusById(id, status) {
+    const { error } = schemaProgramScreeningUpdateStatus.validate({
+      _id: id,
+      status
+    });
+    if (error) {
+      throw new import_nodejs_utils14.BadRequestError(`Invalid data: ${error.message}`);
+    }
     const session = import_nodejs_utils14.useAtlas.getClient()?.startSession();
     try {
       await session?.startTransaction();
       const application = await getProgramScreeningById(id);
       if (!application) {
-        throw new import_nodejs_utils14.AppError("Application not found", 404);
+        throw new import_nodejs_utils14.NotFoundError("Application not found");
       }
       await updateFieldById(
         { _id: id, field: "status", value: status },
         session
       );
       let enrollmentStatus = "pending";
-      const ReclassifyCond = status === "reclassified" && application.status && ["failed", "withdrawn"].includes(application.status);
+      const ReclassifyCond = status === "reclassified" && application.status === "failed";
       if (ReclassifyCond) {
         await removeProgramById(String(application.applicant), session);
       }
@@ -4611,9 +4623,6 @@ function useProgramScreeningService() {
       if (status === "failed" && application.status === "pending") {
         enrollmentStatus = "failed-screening";
       }
-      if (status === "withdrawn" && application.status === "pending") {
-        enrollmentStatus = "withdrawn-screening";
-      }
       await updateEnrollmentStatusById(
         application.applicant,
         enrollmentStatus,
@@ -4621,10 +4630,10 @@ function useProgramScreeningService() {
       );
       await session?.commitTransaction();
       return "Status updated successfully";
-    } catch (error) {
+    } catch (error2) {
       await session?.abortTransaction();
-      if (error instanceof import_nodejs_utils14.AppError) {
-        throw error;
+      if (error2 instanceof import_nodejs_utils14.AppError) {
+        throw error2;
       } else {
         throw new import_nodejs_utils14.AppError("Failed to update status", 500);
       }
@@ -4833,22 +4842,17 @@ function useProgramScreeningController() {
   }
   async function updateStatusById(req, res, next) {
     const id = req.params.id;
-    const validation = import_joi10.default.string().hex().required();
-    const { error } = validation.validate(id);
+    const status = req.body.status ?? "";
+    const { error } = schemaProgramScreeningUpdateStatus.validate({
+      _id: id,
+      status
+    });
     if (error) {
       next(new import_nodejs_utils15.BadRequestError(error.message));
       return;
     }
-    const value = req.body;
-    const { error: updatePayloadError } = import_joi10.default.object({
-      status: import_joi10.default.string().valid(...statusesProgramScreening).required()
-    }).validate(value);
-    if (updatePayloadError) {
-      next(new import_nodejs_utils15.BadRequestError(updatePayloadError.message));
-      return;
-    }
     try {
-      const message = await _updateStatusById(id, value.status);
+      const message = await _updateStatusById(id, status);
       res.json({ message });
       return;
     } catch (error2) {
@@ -5646,6 +5650,11 @@ function useEnrollmentService() {
           "Only enrollments in screening status can be withdrawn."
         );
       }
+      if (enrollment.status === "cancelled" && !enrollment.specialProgram && status === "pending") {
+        throw new import_nodejs_utils19.BadRequestError(
+          "Cancelled enrollment without special program cannot be updated to pending."
+        );
+      }
       const result = await _updateStatusById(_id, status, session);
       if (result.modifiedCount === 0) {
         throw new import_nodejs_utils19.InternalServerError("Failed to accept enrollment");
@@ -5670,10 +5679,11 @@ function useEnrollmentService() {
         await addLearner(enrollment, session);
       }
       const programScreening = await getByApplicantId(_id);
-      if (programScreening) {
-        if (["cancelled", "withdrawn"].includes(status)) {
-          await updateStatusByApplicantId(_id, "cancelled", session);
-        }
+      if (programScreening && status === "cancelled") {
+        await updateStatusByApplicantId(_id, "cancelled", session);
+      }
+      if (programScreening && programScreening.status === "cancelled" && enrollment.status === "cancelled" && enrollment.specialProgram && status === "pending") {
+        await updateStatusByApplicantId(_id, "reclassified", session);
       }
       await session.commitTransaction();
       return "Enrollment accepted successfully";
@@ -47446,6 +47456,7 @@ dotenv.config();
   schemaProgram,
   schemaProgramScreening,
   schemaProgramScreeningUpdate,
+  schemaProgramScreeningUpdateStatus,
   schemaProgramUpdate,
   schemaRegion,
   schemaSchool,