@chevre/domain 23.0.0-alpha.12 → 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/lib/chevre/repo/event.d.ts

@@ -1,5 +1,5 @@
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection, Document, FilterQuery } from 'mongoose';
+import { Connection, Document, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import * as EventFactory from '../factory/event';
 export interface IAttributes4patchUpdate {
@@ -63,6 +63,10 @@ export type ICreatingEvent4ttts = Pick<factory.event.screeningEvent.IAttributes,
 export declare class EventRepo {
     private readonly eventModel;
     constructor(connection: Connection);
+    /**
+     * イベントIDを生成する
+     */
+    static CREATE_ID(): string;
     static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.event.screeningEvent.IEvent>[];
     /**
      * 複数イベントを作成する

package/lib/chevre/repo/event.js

@@ -21,11 +21,14 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventRepo = void 0;
+const mongoose_1 = require("mongoose");
+const uniqid = require("uniqid");
+const errorHandler_1 = require("../errorHandler");
 const factory = require("../factory");
 const EventFactory = require("../factory/event");
-const event_1 = require("./mongoose/schemas/event");
-const errorHandler_1 = require("../errorHandler");
 const settings_1 = require("../settings");
+const event_1 = require("./mongoose/schemas/event");
+const USE_OBJECT_ID_AS_EVENT_ID = process.env.USE_OBJECT_ID_AS_EVENT_ID === '1';
 const AVAILABLE_PUBLIC_PROJECT_FIELDS = [
     'additionalProperty', 'aggregateReservation', 'attendeeCount', 'checkInCount', 'coaInfo',
     // 'description',
@@ -41,6 +44,13 @@ class EventRepo {
     constructor(connection) {
         this.eventModel = connection.model(event_1.modelName, (0, event_1.createSchema)());
     }
+    /**
+     * イベントIDを生成する
+     */
+    static CREATE_ID() {
+        // implement using ObjectId(2025-10-17~)
+        return (USE_OBJECT_ID_AS_EVENT_ID) ? new mongoose_1.Types.ObjectId().toHexString() : uniqid();
+    }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
@@ -260,9 +270,8 @@ class EventRepo {
      */
     createManyEvents(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const insertingDocs = params.attributes.map((p) => {
-                return Object.assign({ _id: uniqid() }, p);
+                return Object.assign({ _id: EventRepo.CREATE_ID() }, p);
             });
             try {
                 yield this.eventModel.insertMany(insertingDocs, { rawResult: true } // rawResult(2024-08-02~)
@@ -292,7 +301,6 @@ class EventRepo {
     upsertManyByAdditionalProperty(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { update } = options;
-            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const bulkWriteOps = [];
             const additionalProperties = [];
             const { events, additionalPropertyFilter, eventSeries, screeningRoom } = params;
@@ -347,7 +355,7 @@ class EventRepo {
                         maximumAttendeeCapacity, remainingAttendeeCapacity, checkInCount, attendeeCount, aggregateReservation, // ←適用しない
                         eventStatus, superEvent } = creatingEventParams, // <-上書き可能な属性を限定的に
                         setOnInsertFields = __rest(creatingEventParams, ["coaInfo", "maximumAttendeeCapacity", "remainingAttendeeCapacity", "checkInCount", "attendeeCount", "aggregateReservation", "eventStatus", "superEvent"]);
-                        const setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { _id: uniqid() });
+                        const setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { _id: EventRepo.CREATE_ID() });
                         bulkWriteOps.push({
                             updateOne: {
                                 filter,
@@ -389,7 +397,6 @@ class EventRepo {
     upsertManyScreeningEventByIdentifier(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { update } = options;
-            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const bulkWriteOps = [];
             const queryFilters = [];
             if (Array.isArray(params)) {
@@ -423,7 +430,7 @@ class EventRepo {
                     }
                     else {
                         const { id, coaInfo, description, maximumAttendeeCapacity, remainingAttendeeCapacity, checkInCount, attendeeCount, aggregateReservation } = $set, setOnInsertFields = __rest($set, ["id", "coaInfo", "description", "maximumAttendeeCapacity", "remainingAttendeeCapacity", "checkInCount", "attendeeCount", "aggregateReservation"]);
-                        const setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { identifier, _id: uniqid() });
+                        const setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { identifier, _id: EventRepo.CREATE_ID() });
                         const updateOne = {
                             filter,
                             update: {
@@ -485,8 +492,7 @@ class EventRepo {
             }
             try {
                 if (params.id === undefined) {
-                    const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-                    const id = uniqid();
+                    const id = EventRepo.CREATE_ID();
                     doc = yield this.eventModel.create(Object.assign(Object.assign({}, params.attributes), { _id: id }));
                     savedEventId = id;
                 }
@@ -566,8 +572,7 @@ class EventRepo {
             if (typeof identifier !== 'string' || identifier.length === 0) {
                 throw new factory.errors.ArgumentNull('identifier');
             }
-            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-            const id = uniqid();
+            const id = EventRepo.CREATE_ID();
             const doc = yield this.eventModel.findOneAndUpdate(
             // 全イベントにidentifierを保証したので、additionalPropertyによるフィルターからidentifierによるフィルターへ変更(2025-09-05~)
             // {

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.12"
+  "version": "23.0.0-alpha.14"
 }