@eeplatform/basic-edu 1.8.2 → 1.8.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.8.4
+
+### Patch Changes
+
+- 3352256: Program Screening - add two more status in schema validation
+
+## 1.8.3
+
+### Patch Changes
+
+- 20e4896: Program Screening - add two more status and action
+
 ## 1.8.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1604,6 +1604,7 @@ type TProgramScreening = {
     updatedAt?: string | Date;
     deletedAt?: string | Date;
 };
+declare const statusesProgramScreening: string[];
 declare const schemaProgramScreening: Joi.ObjectSchema<any>;
 declare const schemaProgramScreeningUpdate: Joi.ObjectSchema<any>;
 declare function modelProgramScreening(value: TProgramScreening): TProgramScreening;
@@ -1648,4 +1649,4 @@ declare function useProgramScreeningController(): {
     updateStatusById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
-export { MAsset, MBuilding, MBuildingUnit, MCurriculum, MGradeLevel, MLearner, MPersonnel, MPlantilla, MStockCard, TAddress, TAddressInformation, TAsset, TBasicEduCount, TBuilding, TBuildingUnit, TCurriculum, TDivision, TEnrollment, TGradeLevel, TLearner, TLearnerInfo, TLearningModality, TParentGuardianInfo, TPersonContact, TPersonnel, TPlantilla, TProgram, TProgramScreening, TRegion, TReturningLearnerInfo, TSchool, TSection, TSectionPreset, TSectionStudent, TSectionSubject, TSeniorHighInformation, TStockCard, TSubject, TTeachingLoad, TTeachingLoadSlot, allowedSectionStudentStatuses, modelBasicEduCount, modelDivision, modelProgram, modelProgramScreening, modelRegion, modelSchool, modelSection, modelSectionPreset, modelSectionStudent, modelSectionSubject, modelSubject, modelTeachingLoad, modelTeachingLoadSlot, schemaAsset, schemaAssetUpdateOption, schemaBasicEduCount, schemaBuilding, schemaBuildingUnit, schemaCurriculum, schemaDivision, schemaDivisionUpdate, schemaEnrollment, schemaGenerateSections, schemaGradeLevel, schemaPersonnel, schemaPlantilla, schemaProgram, schemaProgramScreening, schemaProgramScreeningUpdate, schemaProgramUpdate, schemaRegion, schemaSchool, schemaSchoolUpdate, schemaSection, schemaSectionPreset, schemaSectionStudent, schemaSectionSubject, schemaSectionSubjectSetup, schemaStockCard, schemaSubject, schemaSubjectAdd, schemaTeachingLoad, schemaTeachingLoadSlot, schemaUpdateOptions, schemaUpdateStatus, useAssetController, useAssetRepo, useBasicEduCountRepo, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCurriculumController, useCurriculumRepo, useDivisionController, useDivisionRepo, useDivisionService, useEnrollmentController, useEnrollmentRepo, useEnrollmentService, useGradeLevelController, useGradeLevelRepo, 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, useSubjectController, useSubjectRepo, useSubjectService, useTeachingLoadController, useTeachingLoadRepo, useTeachingLoadSlotController, useTeachingLoadSlotRepo };
+export { MAsset, MBuilding, MBuildingUnit, MCurriculum, MGradeLevel, MLearner, MPersonnel, MPlantilla, MStockCard, TAddress, TAddressInformation, TAsset, TBasicEduCount, TBuilding, TBuildingUnit, TCurriculum, TDivision, TEnrollment, TGradeLevel, TLearner, TLearnerInfo, TLearningModality, TParentGuardianInfo, TPersonContact, TPersonnel, TPlantilla, TProgram, TProgramScreening, TRegion, TReturningLearnerInfo, TSchool, TSection, TSectionPreset, TSectionStudent, TSectionSubject, TSeniorHighInformation, TStockCard, TSubject, TTeachingLoad, TTeachingLoadSlot, allowedSectionStudentStatuses, modelBasicEduCount, modelDivision, modelProgram, modelProgramScreening, modelRegion, modelSchool, modelSection, modelSectionPreset, modelSectionStudent, modelSectionSubject, modelSubject, modelTeachingLoad, modelTeachingLoadSlot, schemaAsset, schemaAssetUpdateOption, schemaBasicEduCount, schemaBuilding, schemaBuildingUnit, schemaCurriculum, schemaDivision, schemaDivisionUpdate, schemaEnrollment, schemaGenerateSections, schemaGradeLevel, schemaPersonnel, schemaPlantilla, schemaProgram, schemaProgramScreening, schemaProgramScreeningUpdate, schemaProgramUpdate, schemaRegion, schemaSchool, schemaSchoolUpdate, schemaSection, schemaSectionPreset, schemaSectionStudent, schemaSectionSubject, schemaSectionSubjectSetup, schemaStockCard, schemaSubject, schemaSubjectAdd, schemaTeachingLoad, schemaTeachingLoadSlot, schemaUpdateOptions, schemaUpdateStatus, statusesProgramScreening, useAssetController, useAssetRepo, useBasicEduCountRepo, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCurriculumController, useCurriculumRepo, useDivisionController, useDivisionRepo, useDivisionService, useEnrollmentController, useEnrollmentRepo, useEnrollmentService, useGradeLevelController, useGradeLevelRepo, 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, useSubjectController, useSubjectRepo, useSubjectService, useTeachingLoadController, useTeachingLoadRepo, useTeachingLoadSlotController, useTeachingLoadSlotRepo };

package/dist/index.js

@@ -1398,6 +1398,7 @@ __export(src_exports, {
   schemaTeachingLoadSlot: () => schemaTeachingLoadSlot,
   schemaUpdateOptions: () => schemaUpdateOptions,
   schemaUpdateStatus: () => schemaUpdateStatus,
+  statusesProgramScreening: () => statusesProgramScreening,
   useAssetController: () => useAssetController,
   useAssetRepo: () => useAssetRepo,
   useBasicEduCountRepo: () => useBasicEduCountRepo,
@@ -4108,6 +4109,13 @@ function useBasicEduCountRepo() {
 var import_nodejs_utils14 = require("@eeplatform/nodejs-utils");
 var import_joi10 = __toESM(require("joi"));
 var import_mongodb9 = require("mongodb");
+var statusesProgramScreening = [
+  "pending",
+  "passed",
+  "failed",
+  "reclassified",
+  "withdrawn"
+];
 var schemaProgramScreening = import_joi10.default.object({
   _id: import_joi10.default.string().hex().optional().allow(null, ""),
   school: import_joi10.default.string().hex().required(),
@@ -4126,7 +4134,7 @@ var schemaProgramScreening = import_joi10.default.object({
       grade: import_joi10.default.number().min(0).max(100).required()
     })
   ).optional(),
-  status: import_joi10.default.string().valid("pending", "pass", "failed").optional(),
+  status: import_joi10.default.string().valid(...statusesProgramScreening).optional(),
   createdAt: import_joi10.default.string().isoDate().optional(),
   updatedAt: import_joi10.default.string().isoDate().optional(),
   deletedAt: import_joi10.default.string().isoDate().optional().allow(null, "")
@@ -4524,10 +4532,7 @@ var import_joi11 = __toESM(require("joi"));
 // src/resources/program-screening/program.screening.service.ts
 var import_nodejs_utils16 = require("@eeplatform/nodejs-utils");
 function useProgramScreeningService() {
-  const {
-    updateStatusById: updateEnrollmentStatusById,
-    getById: getEnrollmentById
-  } = useEnrollmentRepo();
+  const { updateStatusById: updateEnrollmentStatusById } = useEnrollmentRepo();
   const { updateFieldById, getById: getProgramScreeningById } = useProgramScreeningRepo();
   async function updateStatusById(id, status) {
     const session = import_nodejs_utils16.useAtlas.getClient()?.startSession();
@@ -4537,20 +4542,21 @@ function useProgramScreeningService() {
       if (!application) {
         throw new import_nodejs_utils16.AppError("Application not found", 404);
       }
-      if (application.status !== "pending") {
-        throw new import_nodejs_utils16.AppError("Only pending applications can be updated", 400);
-      }
       await updateFieldById(
         { _id: id, field: "status", value: status },
         session
       );
       let enrollmentStatus = "pending";
-      if (status === "passed") {
+      const ReclassifyCond = status === "reclassified" && application.status && ["failed", "withdrawn"].includes(application.status);
+      if (status === "passed" && application.status === "pending" || ReclassifyCond) {
         enrollmentStatus = "pending";
       }
-      if (status === "failed") {
+      if (status === "failed" && application.status === "pending") {
         enrollmentStatus = "failed-screening";
       }
+      if (status === "withdrawn" && application.status === "pending") {
+        enrollmentStatus = "withdrawn-screening";
+      }
       await updateEnrollmentStatusById(
         application.applicant,
         enrollmentStatus,
@@ -4778,7 +4784,7 @@ function useProgramScreeningController() {
     }
     const value = req.body;
     const { error: updatePayloadError } = import_joi11.default.object({
-      status: import_joi11.default.string().valid("passed", "failed").required()
+      status: import_joi11.default.string().valid(...statusesProgramScreening).required()
     }).validate(value);
     if (updatePayloadError) {
       next(new import_nodejs_utils17.BadRequestError(updatePayloadError.message));
@@ -44063,6 +44069,7 @@ dotenv.config();
   schemaTeachingLoadSlot,
   schemaUpdateOptions,
   schemaUpdateStatus,
+  statusesProgramScreening,
   useAssetController,
   useAssetRepo,
   useBasicEduCountRepo,