@chevre/domain 21.33.0 → 21.34.0-alpha.0

package/example/src/chevre/migratePayCreditCardRecipes.ts

@@ -88,7 +88,7 @@ async function main() {
                 'saving recipe...',
                 payAction.project.id, payAction.id, payAction.startDate, i);
             // console.dir(recipe, { depth: null });
-            await actionRepo.saveOneRecipe(recipe);
+            await actionRepo.saveRecipeWithDateCreated(recipe);
             saveRecipeCount += 1;
             console.log('recipe saved.', payAction.project.id, payAction.id, payAction.startDate, i);
         }

package/example/src/chevre/migratePayMovieTicketRecipes.ts

@@ -84,7 +84,7 @@ async function main() {
                 'saving recipe...',
                 payAction.project.id, payAction.id, payAction.startDate, i);
             // console.dir(recipe, { depth: null });
-            await actionRepo.saveOneRecipe(recipe);
+            await actionRepo.saveRecipeWithDateCreated(recipe);
             saveRecipeCount += 1;
             console.log('recipe saved.', payAction.project.id, payAction.id, payAction.startDate, i);
         }

package/example/src/chevre/migrateTransactionObjectPaymentMethods.ts

@@ -127,7 +127,7 @@ async function main() {
                         'saving recipe...',
                         placeOrder.project.id, placeOrder.id, placeOrder.startDate, i);
                     // console.dir(recipe, { depth: null });
-                    await actionRepo.saveOneRecipe(recipe);
+                    await actionRepo.saveRecipeWithDateCreated(recipe);
                     saveRecipeCount += 1;
                     console.log('recipe saved.', placeOrder.project.id, placeOrder.id, placeOrder.startDate, i);
                 }

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

@@ -59,7 +59,7 @@ export interface ICancelActionAction {
         typeOf: 'Task';
     };
 }
-export type IActionRecipe<T extends factory.recipe.RecipeCategory> = T extends factory.recipe.RecipeCategory.checkMovieTicket ? factory.action.check.paymentMethod.movieTicket.IRecipe : T extends factory.recipe.RecipeCategory.payCreditCard ? factory.action.trade.pay.IPayCreditCardRecipe : T extends factory.recipe.RecipeCategory.payMovieTicket ? factory.action.trade.pay.IPayMovieTicketRecipe : T extends factory.recipe.RecipeCategory.publishPaymentUrl ? factory.action.accept.pay.IRecipe : T extends factory.recipe.RecipeCategory.refundCreditCard ? factory.action.trade.refund.IRefundCreditCardRecipe : T extends factory.recipe.RecipeCategory.refundMovieTicket ? factory.action.trade.refund.IRefundMovieTicketRecipe : never;
+export type IActionRecipe<T extends factory.recipe.RecipeCategory> = T extends factory.recipe.RecipeCategory.checkMovieTicket ? factory.action.check.paymentMethod.movieTicket.IRecipe : T extends factory.recipe.RecipeCategory.payCreditCard ? factory.action.trade.pay.IPayCreditCardRecipe : T extends factory.recipe.RecipeCategory.payMovieTicket ? factory.action.trade.pay.IPayMovieTicketRecipe : T extends factory.recipe.RecipeCategory.publishPaymentUrl ? factory.action.accept.pay.IRecipe : T extends factory.recipe.RecipeCategory.refundCreditCard ? factory.action.trade.refund.IRefundCreditCardRecipe : T extends factory.recipe.RecipeCategory.refundMovieTicket ? factory.action.trade.refund.IRefundMovieTicketRecipe : T extends factory.recipe.RecipeCategory.acceptCOAOffer ? factory.action.accept.coaOffer.IRecipe : T extends factory.recipe.RecipeCategory.confirmCOAReserve ? factory.action.interact.confirm.reservation.IConfirmCOAReserveRecipe : never;
 /**
  * アクションリポジトリ
  */
@@ -83,11 +83,13 @@ export declare class MongoRepository {
         typeOf: T;
         id: string;
         result: any;
+        recipe?: factory.recipe.IRecipe;
     }): Promise<IAction<T>>;
     completeWithVoid(params: {
         typeOf: factory.actionType;
         id: string;
         result: any;
+        recipe?: factory.recipe.IRecipe;
     }): Promise<void>;
     /**
      * アクション取消
@@ -314,8 +316,8 @@ export declare class MongoRepository {
     }): Promise<{
         deletedCount?: number;
     } | null>;
-    saveOneRecipe(savingRecipe: factory.recipe.IRecipe & {
-        dateCreated?: Date;
+    saveRecipeWithDateCreated(savingRecipe: factory.recipe.IRecipe & {
+        dateCreated: Date;
     }): Promise<import("mongodb").InsertManyResult<any>>;
     findRecipeByAction<T extends factory.recipe.RecipeCategory>(params: {
         project: {
@@ -415,5 +417,6 @@ export declare class MongoRepository {
         };
     }): Promise<void>;
     private agggregateByStatus;
+    private saveRecipe;
 }
 export {};

package/lib/chevre/repo/action.js

@@ -469,7 +469,11 @@ class MongoRepository {
      * アクション完了
      */
     complete(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            if (((_a = params.recipe) === null || _a === void 0 ? void 0 : _a.typeOf) === 'Recipe') {
+                yield this.saveRecipe(params.recipe);
+            }
             const doc = yield this.actionModel.findOneAndUpdate({
                 typeOf: params.typeOf,
                 _id: params.id
@@ -487,7 +491,11 @@ class MongoRepository {
         });
     }
     completeWithVoid(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            if (((_a = params.recipe) === null || _a === void 0 ? void 0 : _a.typeOf) === 'Recipe') {
+                yield this.saveRecipe(params.recipe);
+            }
             const doc = yield this.actionModel.findOneAndUpdate({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf }
@@ -1046,15 +1054,9 @@ class MongoRepository {
             });
         });
     }
-    saveOneRecipe(savingRecipe) {
+    saveRecipeWithDateCreated(savingRecipe) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.actionRecipeModel.insertMany(Object.assign(Object.assign({}, savingRecipe), { dateCreated: (savingRecipe.dateCreated instanceof Date) ? savingRecipe.dateCreated : new Date() }), { rawResult: true });
-            // const result = await this.actionRecipeModel.insertMany<IRecipe>(savingRecipe, { rawResult: true });
-            // const id = result.insertedIds?.[0]?.toHexString();
-            // if (typeof id !== 'string') {
-            //     throw new factory.errors.ServiceUnavailable('recipe not saved');
-            // }
-            // return { id };
         });
     }
     findRecipeByAction(params) {
@@ -1364,5 +1366,16 @@ class MongoRepository {
             };
         });
     }
+    saveRecipe(savingRecipe) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.actionRecipeModel.insertMany(Object.assign(Object.assign({}, savingRecipe), { dateCreated: new Date() }), { rawResult: true });
+            // const result = await this.actionRecipeModel.insertMany<IRecipe>(savingRecipe, { rawResult: true });
+            // const id = result.insertedIds?.[0]?.toHexString();
+            // if (typeof id !== 'string') {
+            //     throw new factory.errors.ServiceUnavailable('recipe not saved');
+            // }
+            // return { id };
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -85,6 +85,7 @@ function publishPaymentUrl(params, options) {
             : undefined);
         const action = yield repos.action.start(actionAttributes);
         let result;
+        let recipe;
         try {
             switch (paymentServiceType) {
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
@@ -113,12 +114,11 @@ function publishPaymentUrl(params, options) {
                         execTranResult: authorizeResult.execTranResult
                     };
                     // create recipe(2024-06-02~)
-                    const saveRecipeResult = yield repos.action.saveOneRecipe(publishPaymentUrlResult2recipe({
+                    recipe = publishPaymentUrlResult2recipe({
                         project: { id: params.project.id },
                         action: { id: action.id, typeOf: action.typeOf },
                         result
-                    }));
-                    debug('publishPaymentUrl: recipe saved.', JSON.stringify(saveRecipeResult));
+                    });
                     break;
                 default:
                     throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
@@ -137,7 +137,7 @@ function publishPaymentUrl(params, options) {
             paymentMethodId: result.paymentMethodId,
             paymentUrl: result.paymentUrl
         };
-        yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         return result;
     });
 }

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

@@ -1,5 +1,4 @@
-import { factory } from '@cinerino/sdk';
-import * as COA from '@motionpicture/coa-service';
+import * as factory from '../../../../factory';
 type IAcceptedOfferWithoutDetail = factory.action.authorize.offer.eventService.IAcceptedOfferWithoutDetail<factory.service.webAPI.Identifier.COA> & {
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
     ticketInfo: factory.action.authorize.offer.eventService.ICOATicketInfo & {
@@ -11,5 +10,18 @@ type IAcceptedOfferWithoutDetail = factory.action.authorize.offer.eventService.I
 declare function createUpdTmpReserveSeatArgs(params: {
     object: factory.action.authorize.offer.eventService.IObjectWithoutDetail<factory.service.webAPI.Identifier.COA>;
     coaInfo: Pick<factory.event.screeningEvent.ICOAInfo, 'dateJouei' | 'screenCode' | 'theaterCode' | 'timeBegin' | 'timeEnd' | 'titleBranchNum' | 'titleCode'>;
-}): COA.factory.reserve.IUpdTmpReserveSeatArgs;
-export { IAcceptedOfferWithoutDetail, createUpdTmpReserveSeatArgs };
+}): factory.action.accept.coaOffer.IUpdTmpReserveSeatArgs;
+declare function processUpdTmpReserveSeatResult2recipe(params: {
+    processUpdTmpReserveSeatResult: {
+        updTmpReserveSeatArgs?: factory.action.accept.coaOffer.IUpdTmpReserveSeatArgs;
+        updTmpReserveSeatResult?: factory.action.accept.coaOffer.IUpdTmpReserveSeatResult;
+    };
+    project: {
+        id: string;
+    };
+    action: {
+        id: string;
+        typeOf: factory.actionType;
+    };
+}): factory.action.accept.coaOffer.IRecipe;
+export { IAcceptedOfferWithoutDetail, createUpdTmpReserveSeatArgs, processUpdTmpReserveSeatResult2recipe };

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUpdTmpReserveSeatArgs = void 0;
+exports.processUpdTmpReserveSeatResult2recipe = exports.createUpdTmpReserveSeatArgs = void 0;
+const factory = require("../../../../factory");
 function createUpdTmpReserveSeatArgs(params) {
     return {
         theaterCode: params.coaInfo.theaterCode,
@@ -18,3 +19,24 @@ function createUpdTmpReserveSeatArgs(params) {
     };
 }
 exports.createUpdTmpReserveSeatArgs = createUpdTmpReserveSeatArgs;
+function processUpdTmpReserveSeatResult2recipe(params) {
+    const { processUpdTmpReserveSeatResult, project, action } = params;
+    const { updTmpReserveSeatArgs, updTmpReserveSeatResult } = processUpdTmpReserveSeatResult;
+    return {
+        project: { id: project.id, typeOf: factory.organizationType.Project },
+        typeOf: 'Recipe',
+        recipeCategory: factory.recipe.RecipeCategory.acceptCOAOffer,
+        recipeFor: { id: action.id, typeOf: action.typeOf },
+        step: [{
+                typeOf: 'HowToSection',
+                itemListElement: [
+                    {
+                        typeOf: 'HowToStep',
+                        identifier: factory.recipe.StepIdentifier.updTmpReserveSeat,
+                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (updTmpReserveSeatArgs !== undefined) ? { beforeMedia: updTmpReserveSeatArgs } : undefined), (updTmpReserveSeatResult !== undefined) ? { afterMedia: updTmpReserveSeatResult } : undefined)]
+                    }
+                ]
+            }]
+    };
+}
+exports.processUpdTmpReserveSeatResult2recipe = processUpdTmpReserveSeatResult2recipe;

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.reAcceptOffer = exports.acceptOffer = void 0;
 const errorHandler_1 = require("../../../errorHandler");
 const factory = require("../../../factory");
+const settings_1 = require("../../../settings");
 const authorize_1 = require("./acceptOffer/authorize");
 const factory_1 = require("./acceptOffer/factory");
 function findCOAInfo(params) {
@@ -95,6 +96,14 @@ function acceptOffer(params) {
             }
             throw error;
         }
+        const recipe = (0, factory_1.processUpdTmpReserveSeatResult2recipe)({
+            processUpdTmpReserveSeatResult: {
+                updTmpReserveSeatArgs: requestBody,
+                updTmpReserveSeatResult: responseBody
+            },
+            project: { id: transaction.project.id },
+            action: { id: action.id, typeOf: action.typeOf }
+        });
         const result = {
             object: {
                 acceptedOffer,
@@ -103,7 +112,7 @@ function acceptOffer(params) {
             result: { responseBody },
             typeOf: factory.actionType.AuthorizeAction
         };
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        yield repos.action.completeWithVoid(Object.assign({ typeOf: action.typeOf, id: action.id, result }, (settings_1.USE_EXPERIMENTAL_FEATURE) ? { recipe } : undefined));
     });
 }
 exports.acceptOffer = acceptOffer;

package/lib/chevre/service/payment/creditCard/payCreditCard.js

@@ -43,6 +43,7 @@ function payCreditCard(params) {
         let action = yield repos.action.start(params);
         const alterTranResults = [];
         const processAlterTranResults = [];
+        let recipe;
         try {
             const creditService = new GMO.service.Credit({
                 endpoint: String(availableChannel.serviceUrl),
@@ -64,11 +65,11 @@ function payCreditCard(params) {
                 }
             })));
             // add recipe(2024-06-03~)
-            yield repos.action.saveOneRecipe((0, factory_1.processAlterTranResult2payRecipe)({
+            recipe = (0, factory_1.processAlterTranResult2payRecipe)({
                 processAlterTranResults,
                 project: { id: params.project.id },
                 action: { id: action.id, typeOf: action.typeOf }
-            }));
+            });
         }
         catch (error) {
             try {
@@ -80,7 +81,7 @@ function payCreditCard(params) {
             throw error;
         }
         const actionResult = { creditCardSales: alterTranResults };
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
+        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe }));
         yield (0, onPaid_1.onPaid)(action)(repos);
         return action;
     });

package/lib/chevre/service/payment/creditCard/refundCreditCard.js

@@ -66,6 +66,7 @@ function refundCreditCard(params, options) {
         let action = yield repos.action.start(Object.assign(Object.assign({}, startingActionParams), (typeof ((_h = params.sameAs) === null || _h === void 0 ? void 0 : _h.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined));
         const alterTranResult = [];
         let processAlterTranResult;
+        let recipe;
         try {
             const creditService = new GMO.service.Credit({
                 endpoint: String(availableChannel.serviceUrl),
@@ -90,11 +91,11 @@ function refundCreditCard(params, options) {
                 throw processAlterTranResult.processAlterTranError;
             }
             // add recipe(2024-06-04~)
-            yield repos.action.saveOneRecipe((0, factory_1.processAlterTranResult2refundRecipe)({
+            recipe = (0, factory_1.processAlterTranResult2refundRecipe)({
                 processAlterTranResult,
                 project: { id: params.project.id },
                 action: { id: action.id, typeOf: action.typeOf }
-            }));
+            });
         }
         catch (error) {
             try {
@@ -106,7 +107,7 @@ function refundCreditCard(params, options) {
             throw error;
         }
         const actionResult = { alterTranResult };
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
+        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe }));
         yield (0, onRefund_1.onRefund)(action)(repos);
         return action;
     });

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.js

@@ -52,6 +52,7 @@ function checkMovieTicket(params) {
             : undefined);
         const action = yield repos.action.start(actionAttributes);
         let processPurchaseNumberAuthResult;
+        let recipe;
         try {
             const eventIds = [...new Set(optimizedCheckObject.reduce((a, b) => [
                     ...a,
@@ -79,13 +80,11 @@ function checkMovieTicket(params) {
                 paymentServiceId
             })(repos);
             // add recipe(2024-06-07~)
-            if (settings_1.USE_EXPERIMENTAL_FEATURE) {
-                yield repos.action.saveOneRecipe((0, factory_1.processPurchaseNumberAuthResult2checkRecipe)({
-                    processPurchaseNumberAuthResult,
-                    project: { id: params.project.id },
-                    action: { id: action.id, typeOf: action.typeOf }
-                }));
-            }
+            recipe = (0, factory_1.processPurchaseNumberAuthResult2checkRecipe)({
+                processPurchaseNumberAuthResult,
+                project: { id: params.project.id },
+                action: { id: action.id, typeOf: action.typeOf }
+            });
         }
         catch (error) {
             // アクション保管用のエラーと両方保管(2024-05-22~)
@@ -102,7 +101,7 @@ function checkMovieTicket(params) {
             purchaseNumberAuthIn: processPurchaseNumberAuthResult.purchaseNumberAuthIn,
             purchaseNumberAuthResult: processPurchaseNumberAuthResult.purchaseNumberAuthResult
         };
-        yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result });
+        yield repos.action.completeWithVoid(Object.assign({ typeOf: actionAttributes.typeOf, id: action.id, result }, (settings_1.USE_EXPERIMENTAL_FEATURE) ? { recipe } : undefined));
         return { result: processPurchaseNumberAuthResult };
     });
 }

package/lib/chevre/service/payment/movieTicket/payMovieTicket.js

@@ -30,6 +30,7 @@ function payMovieTicket(params) {
         const startingAction = (0, factory_1.createStartingPayAction)(params, seatInfoSyncIn);
         let action = yield repos.action.start(startingAction);
         let processSeatInfoSyncResult;
+        let recipe;
         try {
             // 着券済に対する冪等性を確保する必要はあるが、
             // その他のアクションとしての振る舞いは実行される必要もある
@@ -64,11 +65,11 @@ function payMovieTicket(params) {
                 processSeatInfoSyncResult = yield processSeatInfoSync({ seatInfoSyncIn })({ seatService });
             }
             // add recipe(2024-06-03~)
-            yield repos.action.saveOneRecipe((0, factory_1.processSeatInfoSyncResult2payRecipe)({
+            recipe = (0, factory_1.processSeatInfoSyncResult2payRecipe)({
                 processSeatInfoSyncResult,
                 project: { id: params.project.id },
                 action: { id: action.id, typeOf: action.typeOf }
-            }));
+            });
         }
         catch (error) {
             // アクション保管用のエラーと両方保管(2024-05-22~)
@@ -86,7 +87,7 @@ function payMovieTicket(params) {
             && seatInfoSyncResult.zskyykResult !== undefined)
             ? { seatInfoSyncResult: seatInfoSyncResult }
             : undefined);
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result }));
+        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result, recipe }));
         yield (0, onPaid_1.onPaid)(action)(repos);
         return action;
     });

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js

@@ -95,13 +95,13 @@ function refundMovieTicket(params) {
         }
         else {
             // add recipe(2024-06-04~)
-            yield repos.action.saveOneRecipe((0, factory_1.processSeatInfoSyncResult2refundRecipe)(Object.assign(Object.assign({ project: { id: params.project.id }, action: { id: action.id, typeOf: action.typeOf } }, (processSeatInfoSyncResult !== undefined) ? { processSeatInfoSyncResult } : undefined), (processSeatInfoSyncCancelResult !== undefined) ? { processSeatInfoSyncCancelResult } : undefined)));
+            const recipe = (0, factory_1.processSeatInfoSyncResult2refundRecipe)(Object.assign(Object.assign({ project: { id: params.project.id }, action: { id: action.id, typeOf: action.typeOf } }, (processSeatInfoSyncResult !== undefined) ? { processSeatInfoSyncResult } : undefined), (processSeatInfoSyncCancelResult !== undefined) ? { processSeatInfoSyncCancelResult } : undefined));
             const actionResult = Object.assign(Object.assign({}, ((processSeatInfoSyncResult === null || processSeatInfoSyncResult === void 0 ? void 0 : processSeatInfoSyncResult.seatInfoSyncResult) !== undefined)
                 ? { seatInfoSyncResult: processSeatInfoSyncResult.seatInfoSyncResult }
                 : undefined), ((processSeatInfoSyncCancelResult === null || processSeatInfoSyncCancelResult === void 0 ? void 0 : processSeatInfoSyncCancelResult.seatInfoSyncCancelResult) !== undefined)
                 ? { seatInfoSyncCancelResult: processSeatInfoSyncCancelResult.seatInfoSyncCancelResult }
                 : undefined);
-            action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
+            action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe }));
         }
         yield (0, onRefund_1.onRefund)(action)(repos);
     });

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.374.0-alpha.8",
+    "@chevre/factory": "4.374.0-alpha.9",
     "@cinerino/sdk": "7.1.0",
     "@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.33.0"
+  "version": "21.34.0-alpha.0"
 }