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

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

@@ -52,4 +52,42 @@ export declare class CheckMovieTicketActionRepo extends ActionProcessRepo<ICheck
     }): Promise<(surfrockFactory.service.auth.purchaseNumberAuth.INvalidTicket & {
         knyknrNo: string;
     })[]>;
+    /**
+     * 認証済アクション参照
+     */
+    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'>[]>;
 }

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

@@ -141,5 +141,60 @@ class CheckMovieTicketActionRepo extends actionProcess_1.ActionProcessRepo {
             .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();
     }
+    /**
+     * 認証済アクション参照
+     */
+    async findCompletedCheckActions(params) {
+        const andConditions = [
+            ...(typeof params.id === 'string') ? [{ _id: { $eq: params.id } }] : [],
+            { typeOf: { $eq: factory.actionType.CheckAction } },
+            { actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus } }
+        ];
+        const objectMovieTicketsIdentifierEq = params.object?.movieTickets?.identifier?.$eq;
+        if (typeof objectMovieTicketsIdentifierEq === 'string') {
+            andConditions.push({
+                'object.movieTickets.identifier': { $exists: true, $eq: objectMovieTicketsIdentifierEq }
+            });
+        }
+        const objectMovieTicketsServiceOutputReservationForIdEq = params.object?.movieTickets?.serviceOutput?.reservationFor?.id?.$eq;
+        if (typeof objectMovieTicketsServiceOutputReservationForIdEq === 'string') {
+            andConditions.push({
+                'object.movieTickets.serviceOutput.reservationFor.id': { $exists: true, $eq: objectMovieTicketsServiceOutputReservationForIdEq }
+            });
+        }
+        const objectTypeOfEq = params.object?.typeOf?.$eq;
+        if (typeof objectTypeOfEq === 'string') {
+            andConditions.push({
+                'object.typeOf': { $exists: true, $eq: objectTypeOfEq }
+            });
+        }
+        const objectIdEq = params.object?.id?.$eq;
+        if (typeof objectIdEq === 'string') {
+            andConditions.push({
+                'object.id': { $exists: true, $eq: objectIdEq }
+            });
+        }
+        const purposeIdEq = params.purpose?.id;
+        if (typeof purposeIdEq === 'string') {
+            andConditions.push({
+                'purpose.id': { $exists: true, $eq: purposeIdEq }
+            });
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+        };
+        const query = this.actionModel.find({ $and: andConditions }, projection);
+        query.limit(1);
+        /* istanbul ignore else */
+        if (params.sort?.startDate !== undefined) {
+            query.sort({ startDate: params.sort.startDate });
+        }
+        // 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~
+            .exec();
+    }
 }
 exports.CheckMovieTicketActionRepo = CheckMovieTicketActionRepo;

package/lib/chevre/service/assetTransaction/pay/start/processAuthorize.d.ts

@@ -2,6 +2,7 @@ import * as factory from '../../../../factory';
 import { Settings } from '../../../../settings';
 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';
@@ -14,6 +15,7 @@ import { IPaymentAgencyTransaction } from '../../../payment/creditCard';
 export interface IProcessAuthorizeOperationRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

package/lib/chevre/service/assetTransaction/pay/start/processAuthorizeMovieTicket.d.ts

@@ -2,6 +2,7 @@ import * as factory from '../../../../factory';
 import { Settings } from '../../../../settings';
 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';
@@ -32,6 +33,7 @@ export declare function processAuthorizeMovieTicket(params: factory.assetTransac
 }): (repos: {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

package/lib/chevre/service/assetTransaction/pay/start.d.ts

@@ -3,6 +3,7 @@ import { Settings } from '../../../settings';
 import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
 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';
@@ -18,6 +19,7 @@ export interface IStartOperationRepos {
     acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;

package/lib/chevre/service/payment/any/authorize.d.ts

@@ -3,6 +3,7 @@ import { Settings } from '../../../settings';
 import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
 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 { AuthorizationRepo } from '../../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
@@ -24,6 +25,7 @@ interface IAuthorizeRepos {
     acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     confirmationNumber: ConfirmationNumberRepo;

package/lib/chevre/service/payment/movieTicket/authorize.d.ts

@@ -1,5 +1,6 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -38,6 +39,7 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
     };
 }): (repos: {
     action: ActionRepo;
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;
     event: EventRepo;

package/lib/chevre/service/payment/movieTicket/validation.d.ts

@@ -1,4 +1,4 @@
-import type { ActionRepo } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -7,6 +7,15 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
+export interface IValidateMovieTicketRepos {
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    credentials: CredentialsRepo;
+    event: EventRepo;
+    paymentAccepted: SellerPaymentAcceptedRepo;
+    paymentService: PaymentServiceRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
+    task: TaskRepo;
+}
 export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, checkedAction: {
     id: string;
 }, purpose: {
@@ -14,14 +23,6 @@ export declare function validateMovieTicket(params: factory.assetTransaction.pay
      * placeOrder ID
      */
     id?: string;
-}): (repos: {
-    action: ActionRepo;
-    credentials: CredentialsRepo;
-    event: EventRepo;
-    paymentAccepted: SellerPaymentAcceptedRepo;
-    paymentService: PaymentServiceRepo;
-    paymentServiceProvider: PaymentServiceProviderRepo;
-    task: TaskRepo;
-}, settings: Settings) => Promise<{
+}): (repos: IValidateMovieTicketRepos, settings: Settings) => Promise<{
     accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
 }>;

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

@@ -139,24 +139,26 @@ function checkByIdentifierIfNotYet(params) {
         }
         const specifiedCheckedActionId = params.checkedAction?.id;
         if (typeof specifiedCheckedActionId === 'string' && specifiedCheckedActionId !== '') {
-            alreadyCheckedAction = (await repos.action.search({
-                limit: 1,
-                page: 1,
-                id: { $in: [specifiedCheckedActionId] },
-                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-                ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
-            }, ['id'])).shift();
+            alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions({
+                // limit: 1,
+                // page: 1,
+                // id: { $in: [specifiedCheckedActionId] },
+                id: specifiedCheckedActionId,
+                // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+                // ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
+                ...(typeof placeOrderId === 'string') ? { purpose: { id: placeOrderId } } : undefined
+            })).shift();
             if (alreadyCheckedAction === undefined) {
                 throw new factory.errors.NotFound(factory.actionType.CheckAction);
             }
         }
         else {
-            alreadyCheckedAction = (await repos.action.search({
-                limit: 1,
-                page: 1,
+            alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions({
+                // limit: 1,
+                // page: 1,
                 sort: { startDate: factory.sortType.Descending },
-                typeOf: { $eq: factory.actionType.CheckAction },
-                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+                // typeOf: { $eq: factory.actionType.CheckAction },
+                // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
                 object: {
                     typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
                     id: { $eq: params.paymentServiceId }, // 指定の決済サービスにおいて
@@ -167,11 +169,12 @@ function checkByIdentifierIfNotYet(params) {
                         }
                     }
                 },
-                ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
-            }, ['id'])).shift();
+                // ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
+                ...(typeof placeOrderId === 'string') ? { purpose: { id: placeOrderId } } : undefined
+            })).shift();
         }
         if (alreadyCheckedAction !== undefined) {
-            const recipe = await repos.action.findRecipeByAction({
+            const recipe = await repos.checkMovieTicketAction.findRecipeByAction({
                 project: { id: params.screeningEvent.project.id },
                 recipeFor: { id: alreadyCheckedAction.id }
             });

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

@@ -28,6 +28,7 @@ const factory = __importStar(require("../../factory"));
 const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 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 authorization_1 = require("../../repo/authorization");
 const confirmationNumber_1 = require("../../repo/confirmationNumber");
@@ -76,6 +77,7 @@ function call(params) {
                 acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
                 accountingReport: new accountingReport_1.AccountingReportRepo(connection),
                 action: actionRepo,
+                checkMovieTicketAction: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
                 confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo({ connection }),

package/package.json

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