@eeplatform/basic-edu 1.10.13 → 1.10.15

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.10.15
+
+### Patch Changes
+
+- 95ccd7a: Fix kindergarten routine and domain
+
+## 1.10.14
+
+### Patch Changes
+
+- 8dbfd25: Fix getAll program query
+
 ## 1.10.13
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1846,7 +1846,7 @@ declare function useKindergartenDomainRepo(): {
 };
 
 declare function useKindergartenDomainService(): {
-    deleteById: (id: string) => Promise<void>;
+    deleteById: (id: string) => Promise<string>;
 };
 
 declare function useKindergartenDomainController(): {

package/dist/index.js

@@ -5201,7 +5201,6 @@ function useProgramRepo() {
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      deletedAt: { $in: ["", null] },
       status
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: 1 };
@@ -5490,7 +5489,7 @@ function useProgramController() {
     const status = req.query.status ?? "active";
     const school = req.query.school ?? "";
     const isDefault = req.query.isDefault === "true" ? true : req.query.isDefault === "false" ? false : void 0;
-    const gradeLevel = req.query.gradeLevel?.split(",") ?? [];
+    const gradeLevel = req.query.gradeLevel ? req.query.gradeLevel?.split(",") : [];
     const isPageNumber = isFinite(page);
     if (!isPageNumber) {
       next(new import_nodejs_utils20.BadRequestError("Invalid page number."));
@@ -46494,7 +46493,6 @@ function useKindergartenRoutineRepo() {
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      deletedAt: { $in: ["", null] },
       status
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: 1 };
@@ -46843,7 +46841,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 ?? "";
@@ -47060,9 +47058,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) {
@@ -47385,6 +47384,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) {
@@ -47445,7 +47446,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) {