@chevre/domain 22.6.0-alpha.17 → 22.6.0-alpha.19

package/example/src/chevre/reIndex.ts

@@ -0,0 +1,23 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+// const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    await chevre.repository.CreativeWork.createInstance(mongoose.connection);
+    await chevre.repository.place.MovieTheater.createInstance(mongoose.connection);
+    await chevre.repository.OfferCatalog.createInstance(mongoose.connection);
+    await chevre.repository.OfferCatalogItem.createInstance(mongoose.connection);
+    console.log('success!');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/mongoose/schemas/civicStructure.js

@@ -20,7 +20,7 @@ const schemaDefinition = {
         required: true
     },
     name: mongoose_1.SchemaTypes.Mixed,
-    branchCode: String,
+    branchCode: { type: String, required: true },
     hasEntranceGate: [mongoose_1.SchemaTypes.Mixed],
     hasPOS: [mongoose_1.SchemaTypes.Mixed],
     telephone: String,
@@ -110,6 +110,14 @@ const indexes = [
                 additionalProperty: { $exists: true }
             }
         }
+    ],
+    [
+        // add unique index(2024-11-12~)
+        { 'project.id': 1, branchCode: 1 },
+        {
+            unique: true,
+            name: 'uniqueBranchCode'
+        }
     ]
 ];
 exports.indexes = indexes;

package/lib/chevre/repo/mongoose/schemas/creativeWork.js

@@ -12,7 +12,7 @@ const schemaDefinition = {
         type: String,
         required: true
     },
-    identifier: String,
+    identifier: { type: String, required: true },
     name: mongoose_1.SchemaTypes.Mixed,
     // alternateName: String,
     alternativeHeadline: String,
@@ -146,6 +146,14 @@ const indexes = [
                 additionalProperty: { $exists: true }
             }
         }
+    ],
+    [
+        // add unique index(2024-11-12~)
+        { 'project.id': 1, identifier: 1 },
+        {
+            unique: true,
+            name: 'uniqueIdentifier'
+        }
     ]
 ];
 exports.indexes = indexes;

package/lib/chevre/repo/mongoose/schemas/offerCatalog.d.ts

@@ -9,6 +9,6 @@ type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "OfferCatalog";
-declare function createSchema(): ISchema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
 export { createSchema, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/schemas/offerCatalog.js

@@ -53,26 +53,7 @@ const schemaOptions = {
         versionKey: false
     }
 };
-/**
- * オファーカタログスキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-    }
-    return schema;
-}
-exports.createSchema = createSchema;
 const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ],
     [
         { identifier: 1 },
         {
@@ -129,6 +110,30 @@ const indexes = [
                 additionalProperty: { $exists: true }
             }
         }
+    ],
+    [
+        // add unique index(2024-11-12~)
+        { 'project.id': 1, identifier: 1 },
+        {
+            unique: true,
+            name: 'uniqueIdentifier'
+        }
     ]
 ];
 exports.indexes = indexes;
+/**
+ * オファーカタログスキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

package/lib/chevre/repo/mongoose/schemas/offerCatalogItem.d.ts

@@ -9,6 +9,6 @@ type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "OfferCatalogItem";
-declare function createSchema(): ISchema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
 export { createSchema, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/schemas/offerCatalogItem.js

@@ -51,6 +51,17 @@ const schemaOptions = {
         versionKey: false
     }
 };
+const indexes = [
+    [
+        // add unique index(2024-11-12~)
+        { 'project.id': 1, identifier: 1 },
+        {
+            unique: true,
+            name: 'uniqueIdentifier'
+        }
+    ]
+];
+exports.indexes = indexes;
 /**
  * サブカタログスキーマ
  */
@@ -58,18 +69,12 @@ let schema;
 function createSchema() {
     if (schema === undefined) {
         schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
     }
     return schema;
 }
 exports.createSchema = createSchema;
-const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ]
-];
-exports.indexes = indexes;

package/lib/chevre/repo/mongoose/schemas/place.js

@@ -23,7 +23,7 @@ const schemaDefinition = {
     name: mongoose_1.SchemaTypes.Mixed,
     description: mongoose_1.SchemaTypes.Mixed,
     address: mongoose_1.SchemaTypes.Mixed,
-    branchCode: String,
+    branchCode: { type: String, required: true },
     containedInPlace: mongoose_1.SchemaTypes.Mixed,
     containsPlace: [mongoose_1.SchemaTypes.Mixed],
     maximumAttendeeCapacity: Number,

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.d.ts

@@ -6,6 +6,8 @@ export type IUseReservationAction = factory.action.consume.use.reservation.IActi
 /**
  * 予約使用
  */
-export declare function onReservationUsed(attendedReservation: IAttendedReservation): (repos: {
+export declare function onReservationUsed(attendedReservation: IAttendedReservation, action: factory.action.consume.use.reservation.IAttributes & {
+    id: string;
+}): (repos: {
     task: TaskRepo;
 }, settings: Settings) => Promise<void>;

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.js

@@ -19,24 +19,39 @@ const factory_1 = require("../factory");
 /**
  * 予約使用
  */
-function onReservationUsed(attendedReservation) {
+function onReservationUsed(attendedReservation, action) {
     // tslint:disable-next-line:max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const tasks = [];
         const now = new Date();
         const informReservations = settings.onReservationStatusChanged.informReservation;
         const informTaskRunsAt = now;
-        const reservation4inform = {
-            typeOf: attendedReservation.typeOf,
-            project: attendedReservation.project,
-            id: attendedReservation.id,
-            attended: true,
-            modifiedTime: attendedReservation.modifiedTime,
-            reservedTicket: { dateUsed: attendedReservation.reservedTicket.dateUsed }
-        };
+        // support notification.reservation.IUseAction(2024-11-11~)
+        let reservation4inform;
+        if (settings.useNotificationUseAction) {
+            reservation4inform = Object.assign({ typeOf: action.typeOf, project: action.project, id: action.id, object: {
+                    typeOf: attendedReservation.typeOf,
+                    id: attendedReservation.id,
+                    modifiedTime: attendedReservation.modifiedTime,
+                    reservedTicket: { dateUsed: attendedReservation.reservedTicket.dateUsed }
+                } }, (typeof ((_a = action.location) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
+                ? { location: { identifier: action.location.identifier } }
+                : undefined);
+        }
+        else {
+            reservation4inform = {
+                typeOf: attendedReservation.typeOf,
+                project: attendedReservation.project,
+                id: attendedReservation.id,
+                attended: true,
+                modifiedTime: attendedReservation.modifiedTime,
+                reservedTicket: { dateUsed: attendedReservation.reservedTicket.dateUsed }
+            };
+        }
         const modifiedTimeInMilliseconds = moment(attendedReservation.modifiedTime)
             .valueOf();
-        const informIdentifier = `${attendedReservation.typeOf}:${reservation4inform.id}:attended:${modifiedTimeInMilliseconds}`;
+        const informIdentifier = `${attendedReservation.typeOf}:${attendedReservation.id}:attended:${modifiedTimeInMilliseconds}`;
         // inform galobally
         if (Array.isArray(informReservations)) {
             tasks.push(...informReservations.map((informReservation) => {

package/lib/chevre/service/reserve/useReservation.js

@@ -22,7 +22,7 @@ const debug = createDebug('chevre-domain:service:reserve:useReservation');
 function useReservation(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        const now = new Date();
+        // const now = new Date();
         const reservationId = params.object.id;
         const ticketToken = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.ticketToken;
         // const token = params?.instrument?.token;
@@ -60,7 +60,7 @@ function useReservation(params) {
         let attendedReservation;
         try {
             // 使用日時と同時更新(2023-01-30~)
-            attendedReservation = yield repos.reservation.attendIfNotAttended({ id: reservationId, now });
+            attendedReservation = yield repos.reservation.attendIfNotAttended({ id: reservationId, now: action.startDate });
         }
         catch (error) {
             try {
@@ -72,7 +72,7 @@ function useReservation(params) {
             throw error;
         }
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
-        yield (0, onReservationUsed_1.onReservationUsed)(attendedReservation)({ task: repos.task }, settings);
+        yield (0, onReservationUsed_1.onReservationUsed)(attendedReservation, Object.assign(Object.assign({}, actionAttributes), { id: action.id }))({ task: repos.task }, settings);
     });
 }
 exports.useReservation = useReservation;

package/lib/chevre/settings.d.ts

@@ -82,6 +82,7 @@ interface IOptions {
     useAssetTransactionSyncProcessing: boolean;
     useExperimentalFeature: boolean;
     useNotificationCheckedInAsPackage?: boolean;
+    useNotificationUseAction?: boolean;
     notification: IWebhookSettings;
 }
 /**
@@ -141,6 +142,7 @@ declare class Settings {
     readonly useAssetTransactionSyncProcessing: boolean;
     readonly useExperimentalFeature: boolean;
     readonly useNotificationCheckedInAsPackage: boolean;
+    readonly useNotificationUseAction: boolean;
     /**
      * 通知設定
      */

package/lib/chevre/settings.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "AggregationSettings", { enumerable: true, get: f
  */
 class Settings {
     constructor(options) {
-        const { onEventChanged, onOrderStatusChanged, onResourceUpdated, onReservationStatusChanged, userPoolIdOld, userPoolIdNew, abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, defaultSenderEmail, deliverOrderLimit, coa, gmo, movieticketReserve, useAssetTransactionSyncProcessing, useExperimentalFeature, useNotificationCheckedInAsPackage, notification } = options;
+        const { onEventChanged, onOrderStatusChanged, onResourceUpdated, onReservationStatusChanged, userPoolIdOld, userPoolIdNew, abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, defaultSenderEmail, deliverOrderLimit, coa, gmo, movieticketReserve, useAssetTransactionSyncProcessing, useExperimentalFeature, useNotificationCheckedInAsPackage, useNotificationUseAction, notification } = options;
         this.onEventChanged = onEventChanged;
         this.onOrderStatusChanged = onOrderStatusChanged;
         this.onResourceUpdated = onResourceUpdated;
@@ -26,6 +26,7 @@ class Settings {
         this.useAssetTransactionSyncProcessing = useAssetTransactionSyncProcessing;
         this.useExperimentalFeature = useExperimentalFeature;
         this.useNotificationCheckedInAsPackage = useNotificationCheckedInAsPackage === true;
+        this.useNotificationUseAction = useNotificationUseAction === true;
         this.notification = notification;
     }
 }

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": "4.389.0-alpha.12",
+    "@chevre/factory": "4.389.0-alpha.13",
     "@cinerino/sdk": "10.16.0-alpha.8",
     "@motionpicture/coa-service": "9.5.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.6.0-alpha.17"
+  "version": "22.6.0-alpha.19"
 }