@chevre/domain 20.2.0-alpha.46 → 20.2.0-alpha.48

package/example/src/chevre/migrateOwnershipInfos2newUserPool.ts

@@ -55,7 +55,7 @@ async function main() {
     let updateCount = 0;
     await cursor.eachAsync(async (doc) => {
         i += 1;
-        const ownershipInfo = <chevre.factory.ownershipInfo.IOwnershipInfo<chevre.factory.ownershipInfo.IPermit>>doc.toObject();
+        const ownershipInfo = <chevre.factory.ownershipInfo.IOwnershipInfo<chevre.factory.ownershipInfo.IPermitAsGood>>doc.toObject();
 
         const owner = <chevre.factory.person.IPerson>ownershipInfo.ownedBy;
         let iss =

package/example/src/chevre/ownershipInfosCsv2peopleJson.ts

@@ -132,7 +132,7 @@ function findAccount(params: {
     customer: { id: string };
     now: Date;
 }) {
-    return async (): Promise<chevre.factory.ownershipInfo.IPermit | undefined> => {
+    return async (): Promise<chevre.factory.ownershipInfo.IPermitAsGood | undefined> => {
         const ownershipInfoRepo = new chevre.repository.OwnershipInfo(mongoose.connection);
 
         // let accountOwnershipInfos = await search({
@@ -171,7 +171,7 @@ function findAccount(params: {
             // throw new domain.factory.errors.NotFound('accountOwnershipInfos');
         }
 
-        return <chevre.factory.ownershipInfo.IPermit>ownershipInfos[0].typeOfGood;
+        return <chevre.factory.ownershipInfo.IPermitAsGood>ownershipInfos[0].typeOfGood;
     };
 }
 

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

@@ -581,7 +581,7 @@ function onReservationsCreated(params) {
         // 集計タスク
         yield OfferService.createAggregateScreeningEventIfNotExist({
             project: params.event.project,
-            reservationFor: { id: params.event.id },
+            reservationFor: [{ id: params.event.id }],
             force: false
         })({ task: repos.task });
     });

package/lib/chevre/service/delivery/product/factory.js

@@ -5,6 +5,7 @@ const moment = require("moment");
 const factory = require("../../../factory");
 const MAX_OWNED_THROUGH = '3000-01-01T00:00:00Z';
 function createProductOwnershipInfo(params) {
+    var _a, _b;
     let ownershipInfo;
     let ownedThrough;
     // どういう期間でいくらのオファーなのか
@@ -48,9 +49,14 @@ function createProductOwnershipInfo(params) {
         throw new factory.errors.NotFound('Order.acceptedOffers.priceSpecification.referenceQuantity.value');
     }
     const itemOffered = params.acceptedOffer.itemOffered;
-    const typeOfGood = Object.assign(Object.assign({ project: itemOffered.project, identifier: itemOffered.identifier, issuedThrough: itemOffered.issuedThrough, typeOf: itemOffered.typeOf }, (itemOffered.validFor !== undefined) ? { validFor: itemOffered.validFor } : undefined), (itemOffered.name !== undefined) ? { name: itemOffered.name } : undefined
-    // ...(itemOffered.dateIssued !== undefined) ? { dateIssued: itemOffered.dateIssued } : undefined
-    );
+    // 最適化(2023-02-01~)
+    const issuedThrough = (typeof ((_a = itemOffered.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+        ? Object.assign({ id: itemOffered.issuedThrough.id, typeOf: itemOffered.issuedThrough.typeOf }, (typeof ((_b = itemOffered.issuedThrough.serviceType) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
+            ? { serviceType: itemOffered.issuedThrough.serviceType }
+            : undefined) : undefined;
+    const typeOfGood = Object.assign(Object.assign(Object.assign({ 
+        // project: itemOffered.project, // 最適化(2023-02-01~)
+        identifier: itemOffered.identifier, typeOf: itemOffered.typeOf }, (typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.typeOf) === 'string') ? { issuedThrough } : undefined), (itemOffered.validFor !== undefined) ? { validFor: itemOffered.validFor } : undefined), (itemOffered.name !== undefined) ? { name: itemOffered.name } : undefined);
     ownershipInfo = {
         project: params.project,
         typeOf: 'OwnershipInfo',

package/lib/chevre/service/offer.d.ts

@@ -64,7 +64,7 @@ export declare function searchEventSeatOffersWithPaging(params: {
  * イベント変更時処理
  */
 export declare function onEventChanged(params: {
-    event: factory.event.IEvent<factory.eventType>;
+    event: factory.event.IEvent<factory.eventType> | factory.event.IEvent<factory.eventType>[];
     isNew: boolean;
 }): (repos: {
     event: EventRepo;
@@ -77,7 +77,7 @@ export declare function createAggregateScreeningEventIfNotExist(params: {
     };
     reservationFor: {
         id: string;
-    };
+    }[];
     force: boolean;
 }): (repos: {
     task: TaskRepo;

package/lib/chevre/service/offer.js

@@ -212,63 +212,72 @@ exports.searchEventSeatOffersWithPaging = searchEventSeatOffersWithPaging;
  */
 function onEventChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const changedEvent = params.event;
-        // ScreeningEventであれば集計タスク
-        if (changedEvent.typeOf === factory.eventType.ScreeningEvent) {
-            yield createAggregateScreeningEventIfNotExist({
-                project: changedEvent.project,
-                reservationFor: { id: changedEvent.id },
-                // 新規作成の場合は強制的に集計
-                force: params.isNew
-            })(repos);
+        const changedEvents = (Array.isArray(params.event)) ? params.event : [params.event];
+        if (changedEvents.length > 0) {
+            // ScreeningEventであれば集計タスク
+            if (changedEvents[0].typeOf === factory.eventType.ScreeningEvent) {
+                yield createAggregateScreeningEventIfNotExist({
+                    project: { id: changedEvents[0].project.id },
+                    reservationFor: changedEvents.map((changedEvent) => {
+                        return { id: changedEvent.id };
+                    }),
+                    // 新規作成の場合は強制的に集計
+                    force: params.isNew
+                })(repos);
+            }
         }
     });
 }
 exports.onEventChanged = onEventChanged;
 function createAggregateScreeningEventIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let aggregateTasks = [];
+        const runsAt = new Date();
+        const remainingNumberOfTries = 2;
+        const project = {
+            id: params.project.id, typeOf: factory.organizationType.Project
+        };
         if (params.force) {
-            const aggregateTask = {
-                project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                name: factory.taskName.AggregateScreeningEvent,
-                status: factory.taskStatus.Ready,
-                runsAt: new Date(),
-                remainingNumberOfTries: 3,
-                numberOfTried: 0,
-                executionResults: [],
-                data: {
-                    typeOf: factory.eventType.ScreeningEvent,
-                    id: params.reservationFor.id
-                }
-            };
-            yield repos.task.save(aggregateTask);
-        }
-        else {
-            // 冗長な作成を避ける
-            const readyAggregateScreeningEventTaskDoc = yield repos.task.taskModel.findOne({
-                'project.id': { $eq: params.project.id },
-                name: { $eq: factory.taskName.AggregateScreeningEvent },
-                status: { $eq: factory.taskStatus.Ready },
-                'data.id': { $exists: true, $eq: params.reservationFor.id }
-            }, { _id: 1 })
-                .exec();
-            if (readyAggregateScreeningEventTaskDoc === null) {
-                const aggregateTask = {
-                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
+            aggregateTasks = params.reservationFor.map((reservationFor) => {
+                return {
+                    project,
                     name: factory.taskName.AggregateScreeningEvent,
                     status: factory.taskStatus.Ready,
-                    runsAt: new Date(),
-                    remainingNumberOfTries: 3,
+                    runsAt,
+                    remainingNumberOfTries,
                     numberOfTried: 0,
                     executionResults: [],
-                    data: {
-                        typeOf: factory.eventType.ScreeningEvent,
-                        id: params.reservationFor.id
-                    }
+                    data: { typeOf: factory.eventType.ScreeningEvent, id: reservationFor.id }
                 };
-                yield repos.task.save(aggregateTask);
+            });
+        }
+        else {
+            for (const reservationFor of params.reservationFor) {
+                // 冗長な作成を避ける
+                const readyAggregateScreeningEventTaskDoc = yield repos.task.taskModel.findOne({
+                    'project.id': { $eq: project.id },
+                    name: { $eq: factory.taskName.AggregateScreeningEvent },
+                    status: { $eq: factory.taskStatus.Ready },
+                    'data.id': { $exists: true, $eq: reservationFor.id }
+                }, { _id: 1 })
+                    .exec();
+                if (readyAggregateScreeningEventTaskDoc === null) {
+                    aggregateTasks.push({
+                        project,
+                        name: factory.taskName.AggregateScreeningEvent,
+                        status: factory.taskStatus.Ready,
+                        runsAt,
+                        remainingNumberOfTries,
+                        numberOfTried: 0,
+                        executionResults: [],
+                        data: { typeOf: factory.eventType.ScreeningEvent, id: reservationFor.id }
+                    });
+                }
             }
         }
+        if (aggregateTasks.length > 0) {
+            yield repos.task.saveMany(aggregateTasks);
+        }
     });
 }
 exports.createAggregateScreeningEventIfNotExist = createAggregateScreeningEventIfNotExist;

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

@@ -96,7 +96,7 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
             // 冗長な作成を避ける
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                 project,
-                reservationFor: { id: canceledReservations[0].reservationFor.id },
+                reservationFor: [{ id: canceledReservations[0].reservationFor.id }],
                 force: false
             })({ task: repos.task });
         }

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

@@ -116,7 +116,7 @@ function onReservationCheckedIn(params) {
             yield Promise.all(reservationForIds.map((reservationForId) => __awaiter(this, void 0, void 0, function* () {
                 yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                     project: { id: params.project.id },
-                    reservationFor: { id: reservationForId },
+                    reservationFor: [{ id: reservationForId }],
                     force: false
                 })({ task: repos.task });
             })));

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

@@ -98,7 +98,7 @@ function onReservationConfirmed(confirmedReservations) {
         if (Array.isArray(confirmedReservations) && confirmedReservations.length > 0) {
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                 project: confirmedReservations[0].project,
-                reservationFor: { id: confirmedReservations[0].reservationFor.id },
+                reservationFor: [{ id: confirmedReservations[0].reservationFor.id }],
                 force: false
             })({ task: repos.task });
             const now = new Date();

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

@@ -130,7 +130,7 @@ function onReservationUsed(action, attendedReservation) {
         // 冗長な作成を避ける
         yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
             project: attendedReservation.project,
-            reservationFor: { id: attendedReservation.reservationFor.id },
+            reservationFor: [{ id: attendedReservation.reservationFor.id }],
             force: false
         })({ task: repos.task });
     });

package/lib/chevre/service/transaction/orderProgramMembership/findPaymentCardPermit.d.ts

@@ -23,4 +23,4 @@ export declare function findPaymentCardPermit(params: {
 }): (repos: {
     ownershipInfo: OwnershipInfoRepo;
     product: ProductRepo;
-}) => Promise<factory.ownershipInfo.IPermit>;
+}) => Promise<factory.ownershipInfo.IPermitAsGood>;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.284.0-alpha.3",
-    "@cinerino/sdk": "3.136.0",
+    "@chevre/factory": "4.284.0-alpha.4",
+    "@cinerino/sdk": "3.137.0-alpha.2",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.46"
+  "version": "20.2.0-alpha.48"
 }