@chevre/domain 23.0.0-alpha.13 → 23.0.0-alpha.14

package/example/src/chevre/categoryCode/findCategoryCodes.ts

@@ -0,0 +1,29 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
+
+    const categoryCodes = await categoryCodeRepo.projectFields(
+        {
+            limit: 100,
+            page: 1,
+            project: { id: { $eq: project.id } },
+            inCodeSet: { identifier: { $eq: chevre.factory.categoryCode.CategorySetIdentifier.MovieTicketType } }
+        },
+        [],
+        { excludeMovieTicketType: false }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(categoryCodes.map(({ inCodeSet }) => inCodeSet.identifier), { depth: null });
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/roles/{addAdminProductReadPermissionIfNotExists.ts → addAdminPaymentServiceReadPermissionIfNotExists.ts}

@@ -15,7 +15,7 @@ async function main() {
         chevre.factory.role.organizationRole.RoleName.TicketClerk
     ];
     const permissions = [
-        'admin.products.read'
+        'admin.paymentServices.read'
     ];
     for (const roleName of roleNames) {
         for (const permission of permissions) {

package/example/src/objectId.ts

@@ -0,0 +1,12 @@
+
+// tslint:disable:no-console no-magic-numbers no-null-keyword
+import * as mongoose from 'mongoose';
+
+// const MONGOLAB_URI = String(process.env.MONGOLAB_URI);
+
+async function main() {
+    console.log(new mongoose.Types.ObjectId());
+}
+
+main()
+    .catch(console.error);

package/lib/chevre/repo/categoryCode.d.ts

@@ -10,7 +10,9 @@ type IUnset = {
 export declare class CategoryCodeRepo {
     private readonly categoryCodeModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): FilterQuery<factory.categoryCode.ICategoryCode>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions, options?: {
+        excludeMovieTicketType?: boolean;
+    }): FilterQuery<factory.categoryCode.ICategoryCode>[];
     static CREATE_AGGREGATE_PROJECTION(inclusion: IKeyOfProjection[]): {
         [field: string]: AnyExpression;
     };
@@ -25,7 +27,9 @@ export declare class CategoryCodeRepo {
     /**
      * 空の場合無効
      */
-    inclusion: IKeyOfProjection[]): Promise<(factory.categoryCode.ICategoryCode & {
+    inclusion: IKeyOfProjection[], options?: {
+        excludeMovieTicketType?: boolean;
+    }): Promise<(factory.categoryCode.ICategoryCode & {
         id: string;
     })[]>;
     save(params: {

package/lib/chevre/repo/categoryCode.js

@@ -36,9 +36,29 @@ class CategoryCodeRepo {
         this.categoryCodeModel = connection.model(categoryCode_1.modelName, (0, categoryCode_1.createSchema)());
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    static CREATE_MONGO_CONDITIONS(params) {
+    static CREATE_MONGO_CONDITIONS(params, options) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        const excludeMovieTicketType = (options === null || options === void 0 ? void 0 : options.excludeMovieTicketType) === true;
         const andConditions = [];
+        if (excludeMovieTicketType) {
+            andConditions.push({
+                'inCodeSet.identifier': {
+                    $in: [
+                        factory.categoryCode.CategorySetIdentifier.ContentRatingType,
+                        factory.categoryCode.CategorySetIdentifier.CurrencyType,
+                        factory.categoryCode.CategorySetIdentifier.CustomerType,
+                        factory.categoryCode.CategorySetIdentifier.DistributorType,
+                        factory.categoryCode.CategorySetIdentifier.MembershipType,
+                        factory.categoryCode.CategorySetIdentifier.OfferCategoryType,
+                        factory.categoryCode.CategorySetIdentifier.PaymentMethodType,
+                        factory.categoryCode.CategorySetIdentifier.SeatingType,
+                        factory.categoryCode.CategorySetIdentifier.ServiceType,
+                        factory.categoryCode.CategorySetIdentifier.SoundFormatType,
+                        factory.categoryCode.CategorySetIdentifier.VideoFormatType
+                    ]
+                }
+            });
+        }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.project !== undefined && params.project !== null) {
@@ -99,7 +119,6 @@ class CategoryCodeRepo {
                 if (typeof params.inCodeSet.identifier.$eq === 'string') {
                     andConditions.push({
                         'inCodeSet.identifier': {
-                            $exists: true,
                             $eq: params.inCodeSet.identifier.$eq
                         }
                     });
@@ -110,7 +129,6 @@ class CategoryCodeRepo {
         if (Array.isArray(inCodeSetIdentifierIn)) {
             andConditions.push({
                 'inCodeSet.identifier': {
-                    $exists: true,
                     $in: inCodeSetIdentifierIn
                 }
             });
@@ -207,18 +225,13 @@ class CategoryCodeRepo {
     /**
      * 空の場合無効
      */
-    inclusion) {
+    inclusion, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const conditions = CategoryCodeRepo.CREATE_MONGO_CONDITIONS(params);
+            const conditions = CategoryCodeRepo.CREATE_MONGO_CONDITIONS(params, options);
             let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
-            else {
-                // if (Array.isArray(exclusion) && exclusion.length > 0) {
-                //     positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
-                // }
-            }
             const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
             const query = this.categoryCodeModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
@@ -280,7 +293,6 @@ class CategoryCodeRepo {
                                 'project.id': { $eq: p.attributes.project.id },
                                 codeValue: { $eq: p.attributes.codeValue },
                                 'inCodeSet.identifier': {
-                                    $exists: true,
                                     $eq: p.attributes.inCodeSet.identifier
                                 }
                             },

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.0.0-alpha.13"
+  "version": "23.0.0-alpha.14"
 }