@chevre/domain 21.25.0-alpha.15 → 21.25.0-alpha.17

package/example/src/chevre/migrateScreeningEventSeriesOffers.ts

@@ -0,0 +1,87 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+
+    const cursor = eventRepo.getCursor(
+        {
+            typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries },
+            // typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
+            'project.id': { $ne: EXCLUDED_PROJECT_ID }
+            // 'offers.availabilityEnds': { $exists: true }
+        },
+        {}
+    );
+    console.log('events found');
+
+    let i = 0;
+    let updateCount = 0;
+    const projectIds: string[] = [];
+    let createdAtLatest: Date | undefined;
+    let updatedAtLatest: Date | undefined;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const event: chevre.factory.event.screeningEventSeries.IEvent = doc.toObject();
+
+        const unacceptedPaymentMethod = event.offers?.unacceptedPaymentMethod;
+        const alreadyMigrated =
+            (!Array.isArray(unacceptedPaymentMethod))
+            || (Array.isArray(unacceptedPaymentMethod) && unacceptedPaymentMethod.length === 0)
+            || (Array.isArray(unacceptedPaymentMethod) && unacceptedPaymentMethod.length === 1 && unacceptedPaymentMethod[0] === 'MovieTicket');
+
+        if (alreadyMigrated) {
+            console.log(
+                'already migrated.', event.project.id, event.id, event.startDate, i);
+        } else {
+            projectIds.push(event.project.id);
+            if (createdAtLatest instanceof Date) {
+                if (moment(createdAtLatest)
+                    .isBefore(moment((<any>event).createdAt))) {
+                    createdAtLatest = (<any>event).createdAt;
+                }
+            } else {
+                createdAtLatest = (<any>event).createdAt;
+            }
+            if (updatedAtLatest instanceof Date) {
+                if (moment(updatedAtLatest)
+                    .isBefore(moment((<any>event).updatedAt))) {
+                    updatedAtLatest = (<any>event).updatedAt;
+                }
+            } else {
+                updatedAtLatest = (<any>event).updatedAt;
+            }
+            console.log(
+                'updating event...', event.project.id, event.id, event.startDate, unacceptedPaymentMethod,
+                (<any>event).createdAt,
+                (<any>event).updatedAt,
+                i
+            );
+            // await creativeWorkRepo.saveMovie(<any>{
+            //     id: String(movie.id),
+            //     'offers.availabilityStarts': availabilityStarts
+            // });
+            updateCount += 1;
+            console.log('updated.', event.project.id, event.id, event.startDate, i);
+        }
+    });
+
+    console.log(i, 'events checked');
+    console.log(updateCount, 'events updated');
+    console.log('projectIds:', [...new Set(projectIds)]);
+    console.log('createdAtLatest:', createdAtLatest);
+    console.log('updatedAtLatest:', updatedAtLatest);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/emailMessageBuilder.d.ts

@@ -20,6 +20,5 @@ export declare function createReturnOrderMessage(params: {
  */
 export declare function createRefundMessage(params: {
     order: factory.order.IOrder;
-    paymentMethods: factory.order.IReferencedInvoice[];
     email?: factory.creativeWork.message.email.ICustomization;
 }): Promise<factory.creativeWork.message.email.ICreativeWork>;

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

@@ -75,6 +75,7 @@ declare function authorize(params: {
     noOfferSpecified: boolean;
     options: {
         useCreateOrderOnOfferAccepted: boolean;
+        useResultAcceptedOffers: boolean;
     };
 }): IAuthorizeOperation<IAuthorizeOfferAction>;
 export { authorize };

package/lib/chevre/service/offer/event/authorize.js

@@ -41,7 +41,8 @@ function authorize(params) {
             event: event,
             transaction: transaction,
             pendingTransaction: { typeOf: factory.assetTransactionType.Reserve, transactionNumber },
-            broker: params.object.broker
+            broker: params.object.broker,
+            useResultAcceptedOffers: params.options.useResultAcceptedOffers
         });
         const action = yield repos.action.start(actionAttributes);
         try {
@@ -103,7 +104,7 @@ function authorize(params) {
         const result = Object.assign({ priceCurrency: acceptedOffers[0].priceCurrency, amount: [], requestBody: {}, responseBody: {} }, (!noOfferSpecified) // オファー指定の場合のみ金額計算(2023-11-27~)
             ? {
                 price: (0, factory_1.acceptedOffers2amount)({ acceptedOffers: acceptedOffers4result }),
-                acceptedOffers: acceptedOffers4result
+                acceptedOffers: (params.options.useResultAcceptedOffers === true) ? acceptedOffers4result : []
             }
             : undefined);
         return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });

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

@@ -19,6 +19,7 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
     pendingTransaction: factory.action.authorize.offer.eventService.IChevrePendingTransaction;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
+    useResultAcceptedOffers: boolean;
 }): factory.action.authorize.offer.eventService.IAttributes<factory.service.webAPI.Identifier.Chevre>;
 export declare function acceptedOffers2amount(params: {
     acceptedOffers: IResultAcceptedOffer[];

package/lib/chevre/service/offer/event/factory.js

@@ -91,7 +91,7 @@ function createAuthorizeSeatReservationActionAttributes(params) {
     return {
         project: transaction.project,
         typeOf: factory.actionType.AuthorizeAction,
-        object: Object.assign({ typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation, event: authorizeObjectEvent, acceptedOffer: acceptedOffers, pendingTransaction: params.pendingTransaction }, (params.broker !== undefined) ? { broker: params.broker } : undefined),
+        object: Object.assign(Object.assign({ typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation, event: authorizeObjectEvent, acceptedOffer: acceptedOffers, pendingTransaction: params.pendingTransaction }, (params.broker !== undefined) ? { broker: params.broker } : undefined), { useResultAcceptedOffers: params.useResultAcceptedOffers }),
         agent: {
             id: transaction.seller.id,
             typeOf: transaction.seller.typeOf,

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

@@ -50,5 +50,6 @@ export declare function authorize(params: {
     };
     options: {
         useCreateOrderOnOfferAccepted: boolean;
+        useResultAcceptedOffers: boolean;
     };
 }): IAuthorizeOperation<IAuthorizeOfferAction>;

package/lib/chevre/service/offer/eventServiceByCOA/authorize.js

@@ -79,7 +79,8 @@ function authorize(params) {
                 acceptedOffers: [],
                 event: { id: params.object.event.id, typeOf: factory.eventType.ScreeningEvent },
                 transaction,
-                pendingTransaction
+                pendingTransaction,
+                useResultAcceptedOffers: params.options.useResultAcceptedOffers
             });
             const failedAction = yield repos.action.start(failedActionAttributes);
             yield repos.action.giveUp({ typeOf: failedAction.typeOf, id: failedAction.id, error });
@@ -91,7 +92,8 @@ function authorize(params) {
             acceptedOffers,
             event: screeningEvent,
             transaction,
-            pendingTransaction
+            pendingTransaction,
+            useResultAcceptedOffers: params.options.useResultAcceptedOffers
         });
         const action = yield repos.action.start(actionAttributes);
         try {
@@ -112,7 +114,7 @@ function authorize(params) {
                 amount: eligibleMonetaryAmount,
                 requestBody: params.result.requestBody,
                 responseBody: params.result.responseBody,
-                acceptedOffers: acceptedOffers4result
+                acceptedOffers: (params.options.useResultAcceptedOffers === true) ? acceptedOffers4result : []
             };
             // add orderInTransaction(2024-01-15~)
             if (params.options.useCreateOrderOnOfferAccepted) {

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

@@ -21,5 +21,6 @@ export declare function changeOffers(params: {
     };
     options: {
         useCreateOrderOnOfferAccepted: boolean;
+        useResultAcceptedOffers: boolean;
     };
 }): IAuthorizeOperation<IAuthorizeOfferAction>;

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -91,7 +91,7 @@ function changeOffers(params) {
                 .toDate(),
             totalPrice: price
         });
-        const actionResult = Object.assign(Object.assign({}, authorizeAction.result), { price: price, amount: eligibleMonetaryAmount, acceptedOffers: acceptedOffers4result });
+        const actionResult = Object.assign(Object.assign({}, authorizeAction.result), { price: price, amount: eligibleMonetaryAmount, acceptedOffers: (params.options.useResultAcceptedOffers === true) ? acceptedOffers4result : [] });
         // ActiveActionStatus->CompletedActionStatusで再実装(2024-01-15~)
         yield repos.action.reStart({ id: authorizeAction.id });
         try {

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

@@ -7,6 +7,7 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
     event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'typeOf'>;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     pendingTransaction: factory.action.authorize.offer.eventService.ICOAPendingTransaction;
+    useResultAcceptedOffers: boolean;
 }): factory.action.authorize.offer.eventService.IAttributes<WebAPIIdentifier.COA>;
 /**
  * 供給情報から承認アクションの価格を導き出す

package/lib/chevre/service/offer/eventServiceByCOA/factory.js

@@ -23,7 +23,8 @@ function createAuthorizeSeatReservationActionAttributes(params) {
         typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
         acceptedOffer: params.acceptedOffers,
         event: authorizeObjectEvent,
-        pendingTransaction: params.pendingTransaction
+        pendingTransaction: params.pendingTransaction,
+        useResultAcceptedOffers: params.useResultAcceptedOffers
     };
     return {
         project: transaction.project,

package/lib/chevre/service/task/returnPayTransaction.js

@@ -182,7 +182,6 @@ function createStartRefundTransactionParams(params) {
             paymentMethod: {
                 additionalProperty: params.object.additionalProperty,
                 name: params.object.name,
-                // typeOf: params.object.typeOf,
                 typeOf: paymentMethodType,
                 paymentMethodId: params.object.paymentMethodId
             },

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js

@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReturnPaymentMethodActions = void 0;
 const emailMessageBuilder = require("../../../../emailMessageBuilder");
@@ -36,7 +47,7 @@ function createReturnPaymentMethodPotentialActions(params) {
         if (emailCustomization !== undefined && emailCustomization !== null) {
             const emailMessage = yield emailMessageBuilder.createRefundMessage({
                 order,
-                paymentMethods: [params.paymentMethod],
+                // paymentMethods: [params.paymentMethod],
                 email: emailCustomization
             });
             const sendActionPurpose = {
@@ -103,16 +114,18 @@ function createReturnPaymentMethodActions(params) {
                     .filter((paymentMethod) => {
                     return paymentMethod.issuedThrough.typeOf !== factory.service.paymentService.PaymentServiceType.MovieTicket;
                 })
-                    .map((p) => __awaiter(this, void 0, void 0, function* () {
+                    .map((referencedInvoice) => __awaiter(this, void 0, void 0, function* () {
                     const potentialActionsOnRefund = yield createReturnPaymentMethodPotentialActions({
-                        paymentMethod: p,
+                        paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId },
                         order: params.order,
                         returnOrderActionParams: params.returnOrderActionParams
                     });
+                    const { paymentStatus } = referencedInvoice, referencedInvoiceAsObject = __rest(referencedInvoice, ["paymentStatus"]);
+                    const object = Object.assign(Object.assign({}, referencedInvoiceAsObject), { typeOf: 'Invoice' });
                     return {
                         project: order.project,
                         typeOf: factory.actionType.ReturnAction,
-                        object: p,
+                        object,
                         agent: order.project,
                         recipient: {
                             typeOf: order.customer.typeOf,
@@ -171,16 +184,18 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
             }
             return returnPaymentMethod;
         })
-            .map((p) => __awaiter(this, void 0, void 0, function* () {
+            .map((referencedInvoice) => __awaiter(this, void 0, void 0, function* () {
             const potentialActionsOnRefund = yield createReturnPaymentMethodPotentialActions({
-                paymentMethod: p,
+                paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId },
                 order: params.order,
                 returnOrderActionParams: params.returnOrderActionParams
             });
+            const { paymentStatus } = referencedInvoice, referencedInvoiceAsObject = __rest(referencedInvoice, ["paymentStatus"]);
+            const object = Object.assign(Object.assign({}, referencedInvoiceAsObject), { typeOf: 'Invoice' });
             return {
                 project: order.project,
                 typeOf: factory.actionType.ReturnAction,
-                object: p,
+                object,
                 agent: order.project,
                 recipient: {
                     typeOf: order.customer.typeOf,

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.360.0-alpha.4",
+    "@chevre/factory": "4.360.0-alpha.6",
     "@cinerino/sdk": "5.13.0-alpha.3",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.25.0-alpha.15"
+  "version": "21.25.0-alpha.17"
 }

package/example/src/chevre/migrateMovieAvailabilityStarts.ts

@@ -1,83 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment-timezone';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const creativeWorkRepo = await chevre.repository.CreativeWork.createInstance(mongoose.connection);
-
-    const cursor = creativeWorkRepo.getCursor(
-        {
-            // 'offers.availabilityEnds': { $exists: true }
-        },
-        {}
-    );
-    console.log('creativeWorks found');
-
-    let i = 0;
-    let updateCount = 0;
-    // let datePublishedUndefinedCount = 0;
-    // let datePublishedIsAfterNowCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const movie: chevre.factory.creativeWork.movie.ICreativeWork = doc.toObject();
-
-        const availabilityEnds = movie.offers.availabilityEnds;
-        let availabilityStarts = movie.offers.availabilityStarts;
-        const createdAt: Date = (<any>movie).createdAt;
-        if (!(createdAt instanceof Date)) {
-            throw new Error('createdAt not Date');
-        }
-        const alreadyMigrated = availabilityStarts instanceof Date
-            && moment(availabilityStarts)
-                .isSame(moment(createdAt)
-                    .tz('Asia/Tokyo')
-                    .startOf('day')
-                );
-
-        if (alreadyMigrated) {
-            console.log(
-                'already exist...', movie.project.id, movie.id, movie.identifier, availabilityStarts, availabilityEnds, createdAt, i);
-
-            // if (moment(movie.datePublished)
-            //     .isAfter(moment())) {
-            //     datePublishedIsAfterNowCount += 1;
-            // }
-        } else {
-            // if (movie.datePublished === undefined) {
-            //     console.error('movie.datePublished undefined', movie.project.id, movie.id, movie.identifier, i);
-            //     // throw new Error('movie.datePublished undefined');
-            //     datePublishedUndefinedCount += 1;
-            // }
-
-            availabilityStarts = moment(createdAt)
-                .tz('Asia/Tokyo')
-                .startOf('day')
-                .toDate();
-            console.log('updating movie...', movie.project.id, movie.id, movie.identifier, availabilityStarts, availabilityEnds, i);
-            await creativeWorkRepo.saveMovie(<any>{
-                id: String(movie.id),
-                'offers.availabilityStarts': availabilityStarts
-            });
-            updateCount += 1;
-            console.log('updated.', movie.project.id, movie.id, movie.identifier, availabilityStarts, availabilityEnds, i);
-        }
-    });
-
-    console.log(i, 'creativeWorks checked');
-    console.log(updateCount, 'creativeWorks updated');
-    // console.log(datePublishedUndefinedCount, 'datePublishedUndefinedCount');
-    // console.log(datePublishedIsAfterNowCount, 'datePublishedIsAfterNowCount');
-
-}
-
-main()
-    .then()
-    .catch(console.error);