@eeplatform/basic-edu 1.10.14 → 1.10.16

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.10.16
+
+### Patch Changes
+
+- 7d830d3: Add removeProgramById to enrollment repo and service
+
+## 1.10.15
+
+### Patch Changes
+
+- 95ccd7a: Fix kindergarten routine and domain
+
 ## 1.10.14
 
 ### Patch Changes

package/dist/index.d.ts

@@ -383,6 +383,7 @@ declare function useEnrollmentRepo(): {
     }>;
     updateStatusById: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     getById: (_id: string | ObjectId, status?: string) => Promise<TEnrollment | null>;
+    removeProgramById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
 
 declare function useEnrollmentService(): {
@@ -1846,7 +1847,7 @@ declare function useKindergartenDomainRepo(): {
 };
 
 declare function useKindergartenDomainService(): {
-    deleteById: (id: string) => Promise<void>;
+    deleteById: (id: string) => Promise<string>;
 };
 
 declare function useKindergartenDomainController(): {

package/dist/index.js

@@ -3607,13 +3607,38 @@ function useEnrollmentRepo() {
       throw new Error("Failed to update enrollment status.");
     }
   }
+  async function removeProgramById(_id, session) {
+    try {
+      _id = new import_mongodb6.ObjectId(_id);
+    } catch (error) {
+      throw new import_nodejs_utils9.BadRequestError(namespace_collection + " Invalid ID.");
+    }
+    try {
+      const result = await collection.updateOne(
+        { _id },
+        {
+          $set: {
+            specialProgram: "",
+            specialProgramName: "",
+            updatedAt: /* @__PURE__ */ new Date()
+          }
+        },
+        { session }
+      );
+      delCachedData();
+      return result;
+    } catch (error) {
+      throw new Error("Failed to update enrollment program.");
+    }
+  }
   return {
     createIndexes,
     add,
     getAll,
     getByApplicantInfo,
     updateStatusById,
-    getById
+    getById,
+    removeProgramById
   };
 }
 
@@ -4767,7 +4792,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 } = useEnrollmentRepo();
+  const { updateStatusById: updateEnrollmentStatusById, removeProgramById } = useEnrollmentRepo();
   const { updateFieldById, getById: getProgramScreeningById } = useProgramScreeningRepo();
   async function updateStatusById(id, status) {
     const session = import_nodejs_utils16.useAtlas.getClient()?.startSession();
@@ -4783,6 +4808,9 @@ function useProgramScreeningService() {
       );
       let enrollmentStatus = "pending";
       const ReclassifyCond = status === "reclassified" && application.status && ["failed", "withdrawn"].includes(application.status);
+      if (ReclassifyCond) {
+        await removeProgramById(String(application.applicant), session);
+      }
       if (status === "passed" && application.status === "pending" || ReclassifyCond) {
         enrollmentStatus = "pending";
       }
@@ -46493,7 +46521,6 @@ function useKindergartenRoutineRepo() {
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      deletedAt: { $in: ["", null] },
       status
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: 1 };
@@ -46842,7 +46869,7 @@ function useKindergartenRoutineController() {
     const limit = typeof req.query.limit === "string" ? Number(req.query.limit) : 10;
     const search = req.query.search ?? "";
     const status = req.query.status ?? "active";
-    const school = req.query.school ?? "";
+    const school = req.params.school ?? "";
     const section = req.query.section ?? "";
     const classroom = req.query.classroom ?? "";
     const type = req.query.type ?? "";
@@ -47059,9 +47086,10 @@ function useKindergartenDomainRepo() {
         { key: { createdBy: 1 } },
         { key: { title: "text" } },
         {
-          key: { title: 1, school: 1, status: 1 },
+          key: { title: 1, school: 1 },
           unique: true,
-          name: "unique_kindergarten_domain"
+          name: "unique_kindergarten_domain",
+          partialFilterExpression: { status: "active" }
         }
       ]);
     } catch (error) {
@@ -47384,6 +47412,8 @@ function useKindergartenDomainService() {
         );
       }
       await _deleteById(id, session);
+      await session.commitTransaction();
+      return "Successfully deleted kindergarten domain.";
     } catch (error) {
       await session.abortTransaction();
       if (error instanceof import_nodejs_utils91.AppError) {
@@ -47444,7 +47474,7 @@ function useKindergartenDomainController() {
     const limit = typeof req.query.limit === "string" ? Number(req.query.limit) : 10;
     const search = req.query.search ?? "";
     const status = req.query.status ?? "active";
-    const school = req.query.school ?? "";
+    const school = req.params.school ?? "";
     const createdBy = req.query.createdBy ?? "";
     const isPageNumber = isFinite(page);
     if (!isPageNumber) {