@chevre/domain 23.2.0-alpha.20 → 23.2.0-alpha.21

package/example/src/chevre/place/adminEntranceGates.ts

@@ -16,6 +16,7 @@ async function main() {
         limit: 10,
         page: 1,
         project: { id: { $eq: project.id } }
+        // identifier: { $in: ['GATE01', 'GATE03', 'xx'] }
     });
     console.log(gates);
     console.log(gates.length);

package/lib/chevre/repo/place/entranceGate.d.ts

@@ -10,8 +10,8 @@ interface IOperator {
      */
     id: string;
 }
-type IEntranceGate = Pick<factory.place.movieTheater.IEntranceGate, 'identifier' | 'name'>;
-type ICreatingEntranceGate = Pick<factory.place.movieTheater.IEntranceGate, 'identifier' | 'name'>;
+type IEntranceGate = Pick<factory.place.entranceGate.IEntranceGate, 'identifier' | 'name'>;
+type ICreatingEntranceGate = Pick<factory.place.entranceGate.IEntranceGate, 'identifier' | 'name'>;
 interface IUpdateOptions {
     project: {
         id: string;
@@ -24,18 +24,7 @@ export declare class EntranceGateRepo {
     private readonly operator;
     private readonly civicStructureModel;
     constructor(connection: Connection, operater: IOperator);
-    findEntranceGates(params: {
-        limit: number;
-        page: number;
-        project?: {
-            id?: {
-                $eq?: string;
-            };
-        };
-        identifier?: {
-            $eq?: string;
-        };
-    }): Promise<IEntranceGate[]>;
+    findEntranceGates(params: factory.place.entranceGate.ISearchConditions): Promise<IEntranceGate[]>;
     addEntranceGatesByIdentifierIfNotExist(params: {
         $set: ICreatingEntranceGate;
     }[], options: IUpdateOptions): Promise<{
@@ -54,5 +43,6 @@ export declare class EntranceGateRepo {
     }[], options: IUpdateOptions): Promise<{
         bulkWriteResult?: BulkWriteResult;
     }>;
+    private createMatchStages;
 }
 export {};

package/lib/chevre/repo/place/entranceGate.js

@@ -24,25 +24,13 @@ class EntranceGateRepo {
     }
     findEntranceGates(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            const matchStages = [
-                { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(this.operator.id) } } }
-            ];
-            const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
-            if (typeof projectIdEq === 'string') {
-                matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
-            }
-            const identifierEq = (_c = params.identifier) === null || _c === void 0 ? void 0 : _c.$eq;
-            if (typeof identifierEq === 'string') {
-                matchStages.push({ $match: { 'hasEntranceGate.identifier': { $eq: identifierEq } } });
-            }
             const aggregate = this.civicStructureModel.aggregate([
                 {
                     $unwind: {
                         path: '$hasEntranceGate'
                     }
                 },
-                ...matchStages,
+                ...this.createMatchStages(params),
                 { $sort: { 'hasEntranceGate.identifier': factory.sortType.Ascending } },
                 {
                     $project: {
@@ -155,5 +143,24 @@ class EntranceGateRepo {
             return {};
         });
     }
+    createMatchStages(params) {
+        var _a, _b, _c, _d;
+        const matchStages = [
+            { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(this.operator.id) } } }
+        ];
+        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
+        }
+        const identifierEq = (_c = params.identifier) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof identifierEq === 'string') {
+            matchStages.push({ $match: { 'hasEntranceGate.identifier': { $eq: identifierEq } } });
+        }
+        const identifierIn = (_d = params.identifier) === null || _d === void 0 ? void 0 : _d.$in;
+        if (Array.isArray(identifierIn)) {
+            matchStages.push({ $match: { 'hasEntranceGate.identifier': { $in: identifierIn } } });
+        }
+        return matchStages;
+    }
 }
 exports.EntranceGateRepo = EntranceGateRepo;

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.4.0-alpha.12",
+    "@chevre/factory": "5.4.0-alpha.13",
     "@cinerino/sdk": "12.12.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -116,5 +116,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.20"
+  "version": "23.2.0-alpha.21"
 }