@chevre/domain 24.0.0-alpha.37 → 24.0.0-alpha.38

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

@@ -130,7 +130,8 @@ export declare class ActionProcessRepo<TAction extends IAction<factory.actionTyp
         };
         object?: {
             typeOf?: {
-                $eq?: factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment | factory.offerType.AggregateOffer;
+                $eq?: factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment | factory.action.authorize.offer.eventService.ObjectType.AggregateOffer | factory.offerType.AggregateOffer;
+                $in?: (factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.offer.eventService.ObjectType.AggregateOffer)[];
             };
             paymentMethodId?: {
                 $eq?: string;

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

@@ -723,6 +723,10 @@ class ActionProcessRepo {
         if (typeof objectTypeOfEq === 'string') {
             andConditions.push({ 'object.typeOf': { $exists: true, $eq: objectTypeOfEq } });
         }
+        const objectTypeOfIn = params.object?.typeOf?.$in;
+        if (Array.isArray(objectTypeOfIn)) {
+            andConditions.push({ 'object.typeOf': { $exists: true, $in: objectTypeOfIn } });
+        }
         if (typeof params.typeOf === 'string') {
             andConditions.push({ typeOf: { $eq: params.typeOf } });
         }

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

@@ -20,6 +20,9 @@ export declare class AuthorizeOfferActionRepo extends ActionProcessRepo<IAuthori
          */
         ids: string[];
     }): Promise<IAuthorizeOfferActionWithInstrument[]>;
+    /**
+     * 注文取引から興行オファー承認アクションを参照する
+     */
     findAuthorizeOfferActionsByPurpose(params: {
         /**
          * 注文取引でフィルター
@@ -35,6 +38,24 @@ export declare class AuthorizeOfferActionRepo extends ActionProcessRepo<IAuthori
             $eq?: factory.actionStatusType.CompletedActionStatus;
         };
     }): Promise<IAuthorizeEventServiceOfferAction[]>;
+    /**
+     * 注文取引から汎用オファー承認アクションを参照する
+     */
+    findAuthorizeAnyOfferActionsByPurpose(params: {
+        /**
+         * 注文取引でフィルター
+         */
+        purpose: {
+            typeOf: factory.transactionType;
+            id: string;
+        };
+        /**
+         * アクションステータスでフィルター
+         */
+        actionStatus?: {
+            $eq?: factory.actionStatusType.CompletedActionStatus;
+        };
+    }): Promise<IAuthorizeOfferAction[]>;
     /**
      * アクション再開
      */

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

@@ -45,13 +45,16 @@ class AuthorizeOfferActionRepo extends actionProcess_1.ActionProcessRepo {
                 typeOf: {
                     $in: [
                         factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
-                        factory.offerType.AggregateOffer
+                        factory.action.authorize.offer.eventService.ObjectType.AggregateOffer
                     ]
                 }
             },
             id: { $in: params.ids }
         }, ['instrument']);
     }
+    /**
+     * 注文取引から興行オファー承認アクションを参照する
+     */
     async findAuthorizeOfferActionsByPurpose(params) {
         return this.findAnyActionsByPurpose({
             ...params,
@@ -63,6 +66,27 @@ class AuthorizeOfferActionRepo extends actionProcess_1.ActionProcessRepo {
             object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } }
         });
     }
+    /**
+     * 注文取引から汎用オファー承認アクションを参照する
+     */
+    async findAuthorizeAnyOfferActionsByPurpose(params) {
+        return this.findAnyActionsByPurpose({
+            ...params,
+            typeOf: factory.actionType.AuthorizeAction,
+            purpose: {
+                typeOf: params.purpose.typeOf,
+                id: params.purpose.id
+            },
+            object: {
+                typeOf: {
+                    $in: [
+                        factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
+                        factory.action.authorize.offer.eventService.ObjectType.AggregateOffer
+                    ]
+                }
+            }
+        });
+    }
     /**
      * アクション再開
      */

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

@@ -40,7 +40,7 @@ class AuthorizeProductOfferActionRepo extends actionProcess_1.ActionProcessRepo
             ...params,
             typeOf: factory.actionType.AuthorizeAction,
             object: {
-                typeOf: { $eq: factory.offerType.AggregateOffer }
+                typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.AggregateOffer }
             }
         });
         return authorizeActions.filter((a) => 
@@ -48,7 +48,7 @@ class AuthorizeProductOfferActionRepo extends actionProcess_1.ActionProcessRepo
         // && a.object.length > 0
         // // && a.object[0].typeOf === factory.offerType.Offer
         // && availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0
-        a.object.typeOf === factory.offerType.AggregateOffer
+        a.object.typeOf === factory.action.authorize.offer.product.ObjectType.AggregateOffer
             && availableProductTypes_1.availableProductTypes.indexOf(a.object.itemOffered.typeOf) >= 0);
     }
 }

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

@@ -37,7 +37,7 @@ export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActio
         };
         object?: {
             typeOf?: {
-                $eq?: factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment | factory.offerType.AggregateOffer;
+                $eq?: factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment | factory.action.authorize.offer.product.ObjectType.AggregateOffer;
             };
             paymentMethodId?: {
                 $eq?: string;

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

@@ -80,7 +80,7 @@ function createRegisterServiceStartParams(params) {
 function createActionAttributes(params) {
     const transaction = params.transaction;
     const actionObject = {
-        typeOf: factory.offerType.AggregateOffer,
+        typeOf: factory.action.authorize.offer.product.ObjectType.AggregateOffer,
         itemOffered: {
             id: params.acceptedOffer[0].itemOffered.id,
             typeOf: params.acceptedOffer[0].itemOffered.typeOf

package/lib/chevre/service/offer/product.js

@@ -250,7 +250,7 @@ function voidTransaction(params) {
             // && a.object.length > 0
             // && a.object[0].typeOf === factory.offerType.Offer
             // && availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0
-            a.object.typeOf === factory.offerType.AggregateOffer
+            a.object.typeOf === factory.action.authorize.offer.product.ObjectType.AggregateOffer
                 && availableProductTypes_1.availableProductTypes.indexOf(a.object.itemOffered.typeOf) >= 0));
         }
         await Promise.all(authorizeActions.map(async (action) => {

package/lib/chevre/service/transaction/placeOrder/confirm.d.ts

@@ -1,4 +1,6 @@
 import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizePaymentMethodActionRepo } from '../../../repo/action/authorizePaymentMethod';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
@@ -13,6 +15,8 @@ import * as factory from '../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IConfirmOperationRepos {
     action: ActionRepo;
+    authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     emailMessage?: EmailMessageRepo;
@@ -57,4 +61,4 @@ interface IConfirmResult {
  * 注文取引を確定する
  */
 declare function confirm(params: IConfirmParams, options: IConfirmOptions): IConfirmOperation<IConfirmResult>;
-export { confirm };
+export { IConfirmOperationRepos, confirm };

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -263,7 +263,7 @@ function dissolveAuthorizeActions(completedAuthorizeActions) {
                 }
                 serialNumber = assetTransactionNumber;
             }
-            else if (a.object.typeOf === factory.offerType.AggregateOffer
+            else if (a.object.typeOf === factory.action.authorize.offer.product.ObjectType.AggregateOffer
                 && a.instrument?.typeOf === factory.assetTransactionType.RegisterService) {
                 authorizeProductOfferActions.push(a);
                 serialNumber = a.instrument.transactionNumber;
@@ -420,15 +420,33 @@ function searchAcceptPayActions(params) {
 function searchAuthorizeActions(params) {
     return async (repos) => {
         // 取引に対する全ての承認アクションをマージ
-        let authorizeActions = await repos.action.searchByPurpose({
-            typeOf: factory.actionType.AuthorizeAction,
-            purpose: {
-                typeOf: factory.transactionType.PlaceOrder,
-                id: params.id
-            },
-            // Completedに絞る(2023-05-16~)
-            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
-        });
+        // let authorizeActions = <IAuthorizeOfferOrPaymentAction[]>await repos.action.searchByPurpose({
+        //     typeOf: factory.actionType.AuthorizeAction,
+        //     purpose: {
+        //         typeOf: factory.transactionType.PlaceOrder,
+        //         id: params.id
+        //     },
+        //     // Completedに絞る(2023-05-16~)
+        //     actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+        // });
+        let authorizeActions = [
+            ...await repos.authorizePaymentMethodAction.findAuthorizePaymentMethodActionsByPurpose({
+                purpose: {
+                    typeOf: factory.transactionType.PlaceOrder,
+                    id: params.id
+                },
+                // Completedに絞る(2023-05-16~)
+                actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+            }),
+            ...await repos.authorizeOfferAction.findAuthorizeAnyOfferActionsByPurpose({
+                purpose: {
+                    typeOf: factory.transactionType.PlaceOrder,
+                    id: params.id
+                },
+                // Completedに絞る(2023-05-16~)
+                actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+            }),
+        ];
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
         authorizeActions = authorizeActions.filter((a) => {
             return (a.endDate instanceof Date) && (0, moment_1.default)(a.endDate)

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "6.0.0-alpha.1",
+    "@chevre/factory": "6.0.0-alpha.2",
     "@cinerino/sdk": "13.2.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.37"
+  "version": "24.0.0-alpha.38"
 }