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

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/service/payment/movieTicket/validation.js

@@ -173,6 +173,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/payment/payByTask.d.ts

@@ -13,6 +13,12 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
+interface IPayTask2payActionAttributesRepos {
+    action: ActionRepo;
+    acceptedOffer: AcceptedOfferRepo;
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+}
 declare function payTask2payActionAttributes(params: factory.task.pay.IData & {
     sameAs?: {
         /**
@@ -21,16 +27,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 +42,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/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.21"
 }