@chevre/domain 24.0.0-alpha.20 → 24.0.0-alpha.22

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

@@ -4,6 +4,57 @@ import { ActionProcessRepo, IActionRecipe } from './actionProcess';
 export type IMinimizedPurchaseNumberAuthResult = Pick<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult, 'mkknmiNumSum' | 'resultInfo' | 'ykknmiNumSum'> & {
     knyknrNoInfoOut: Omit<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberInfo, 'ykknInfo' | 'mkknInfo'>[] | null;
 };
+/**
+ * アクションIDで参照、あるいは、決済カードコード+イベントIDで参照
+ */
+type IFindCompletedCheckActionsParams = ({
+    /**
+     * アクションID
+     */
+    id?: string;
+    purpose?: {
+        /**
+         * 注文取引ID
+         */
+        id?: string;
+    };
+    object?: never;
+    sort?: never;
+}) | (Pick<factory.action.ISearchConditions, 'sort'> & {
+    purpose?: {
+        /**
+         * 注文取引ID
+         */
+        id?: string;
+    };
+    object?: {
+        /**
+         * 決済サービス
+         */
+        id?: {
+            $eq?: string;
+        };
+        movieTickets?: {
+            identifier?: {
+                $eq?: string;
+            };
+            serviceOutput?: {
+                reservationFor?: {
+                    id?: {
+                        $eq?: string;
+                    };
+                };
+            };
+        };
+        typeOf?: {
+            $eq?: factory.service.paymentService.PaymentServiceType.MovieTicket;
+        };
+    };
+    /**
+     * アクションID
+     */
+    id?: never;
+});
 export type ICheckMovieTicketAction = factory.action.check.paymentMethod.movieTicket.IAction;
 /**
  * 決済カード認証アクションリポジトリ
@@ -55,39 +106,6 @@ export declare class CheckMovieTicketActionRepo extends ActionProcessRepo<ICheck
     /**
      * 認証済アクション参照
      */
-    findCompletedCheckActions(params: Pick<factory.action.ISearchConditions, 'sort'> & {
-        /**
-         * アクションID
-         */
-        id?: string;
-        purpose?: {
-            /**
-             * 注文取引ID
-             */
-            id?: string;
-        };
-        object?: {
-            /**
-             * 決済サービス
-             */
-            id?: {
-                $eq?: string;
-            };
-            movieTickets?: {
-                identifier?: {
-                    $eq?: string;
-                };
-                serviceOutput?: {
-                    reservationFor?: {
-                        id?: {
-                            $eq?: string;
-                        };
-                    };
-                };
-            };
-            typeOf?: {
-                $eq?: factory.service.paymentService.PaymentServiceType.MovieTicket;
-            };
-        };
-    }): Promise<Pick<ICheckMovieTicketAction, 'id'>[]>;
+    findCompletedCheckActions(params: IFindCompletedCheckActionsParams): Promise<Pick<ICheckMovieTicketAction, 'id'>[]>;
 }
+export {};

package/lib/chevre/repo/action/checkMovieTicket.js

@@ -193,7 +193,7 @@ class CheckMovieTicketActionRepo extends actionProcess_1.ActionProcessRepo {
         // const explainResult = await (<any>query).explain();
         // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
         return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .lean() // 2024-08-26~
+            .lean()
             .exec();
     }
 }

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

@@ -7,7 +7,7 @@ export { ICancelActionAction };
  * 汎用アクションリポジトリで開始可能なアクションタイプ
  */
 type StartableActionType = Exclude<factory.actionType, factory.actionType.AcceptAction | factory.actionType.CheckAction>;
-type IAvailableActionRecipe = IActionRecipe<Exclude<factory.recipe.RecipeCategory, factory.recipe.RecipeCategory.publishPaymentUrl>>;
+type IAvailableActionRecipe = IActionRecipe<Exclude<factory.recipe.RecipeCategory, factory.recipe.RecipeCategory.publishPaymentUrl | factory.recipe.RecipeCategory.checkMovieTicket>>;
 /**
  * アクションリポジトリ
  */

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

@@ -137,6 +137,10 @@ function checkByIdentifierIfNotYet(params) {
         if (typeof placeOrderId === 'string') {
             // no op
         }
+        else {
+            // 注文取引IDの未指定ケースがあるかどうか確認するためにlog
+            console.log('checkByIdentifierIfNotYet: placeOrderId undefined. params:', JSON.stringify(params));
+        }
         const specifiedCheckedActionId = params.checkedAction?.id;
         if (typeof specifiedCheckedActionId === 'string' && specifiedCheckedActionId !== '') {
             alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions({
@@ -153,6 +157,8 @@ function checkByIdentifierIfNotYet(params) {
             }
         }
         else {
+            // 認証IDの未指定ケースがあるかどうか確認するためにlog
+            console.log('checkByIdentifierIfNotYet: specifiedCheckedActionId undefined. params:', JSON.stringify(params));
             alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions({
                 // limit: 1,
                 // page: 1,
@@ -173,6 +179,7 @@ function checkByIdentifierIfNotYet(params) {
                 ...(typeof placeOrderId === 'string') ? { purpose: { id: placeOrderId } } : undefined
             })).shift();
         }
+        debug('checkByIdentifierIfNotYet: alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'params:', JSON.stringify(params));
         if (alreadyCheckedAction !== undefined) {
             const recipe = await repos.checkMovieTicketAction.findRecipeByAction({
                 project: { id: params.screeningEvent.project.id },

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

@@ -28,6 +28,7 @@ const factory = __importStar(require("../../factory"));
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
@@ -51,7 +52,8 @@ function call(params) {
             ...params.data,
             sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
         })({
-            action: new action_1.ActionRepo(connection),
+            // action: new ActionRepo(connection),
+            checkMovieTicketAction: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             order: new order_1.OrderRepo(connection)

package/lib/chevre/service/task/payment/payByTask.d.ts

@@ -1,6 +1,7 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
@@ -13,6 +14,12 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
+interface IPayTask2payActionAttributesRepos {
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    acceptedOffer: AcceptedOfferRepo;
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+}
 declare function payTask2payActionAttributes(params: factory.task.pay.IData & {
     sameAs?: {
         /**
@@ -21,16 +28,8 @@ declare function payTask2payActionAttributes(params: factory.task.pay.IData & {
         id: string;
         typeOf: 'Task';
     };
-}): (repos: {
-    action: ActionRepo;
-    acceptedOffer: AcceptedOfferRepo;
-    assetTransaction: AssetTransactionRepo;
-    order: OrderRepo;
-}) => Promise<factory.action.trade.pay.IAttributes>;
-/**
- * 決済確定
- */
-declare function payByTask(payActionAttributes: factory.action.trade.pay.IAttributes): (repos: {
+}): (repos: IPayTask2payActionAttributesRepos) => Promise<factory.action.trade.pay.IAttributes>;
+interface IPayByTaskRepos {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
@@ -44,5 +43,9 @@ declare function payByTask(payActionAttributes: factory.action.trade.pay.IAttrib
     product: ProductRepo;
     project: ProjectRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
-export { payByTask, payTask2payActionAttributes };
+}
+/**
+ * 決済確定
+ */
+declare function payByTask(payActionAttributes: factory.action.trade.pay.IAttributes): (repos: IPayByTaskRepos, settings: Settings) => Promise<void>;
+export { IPayTask2payActionAttributesRepos, IPayByTaskRepos, payByTask, payTask2payActionAttributes };

package/lib/chevre/service/task/payment/payByTask.js

@@ -125,7 +125,7 @@ function payTask2payActionAttributes(params) {
             let checkResult;
             const checkedActionId = transaction.object.checkedAction?.id;
             if (typeof checkedActionId === 'string' && checkedActionId !== '') {
-                const recipe = await repos.action.findRecipeByAction({
+                const recipe = await repos.checkMovieTicketAction.findRecipeByAction({
                     project: { id: transaction.project.id },
                     recipeFor: { id: checkedActionId }
                 });

package/package.json

@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.20"
+  "version": "24.0.0-alpha.22"
 }