@chevre/domain 24.0.0-alpha.16 → 24.0.0-alpha.17

package/lib/chevre/service/aggregation/system.js

@@ -219,7 +219,7 @@ function aggregateAuthorizeEventServiceOfferAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateAuthorizeEventServiceOfferAction({
+            const aggregateResult = await repos.aggregateAction.aggregateAuthorizeEventServiceOfferAction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -264,7 +264,7 @@ function aggregateAuthorizePaymentAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateAuthorizePaymentAction({
+            const aggregateResult = await repos.aggregateAction.aggregateAuthorizePaymentAction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -306,7 +306,7 @@ function aggregateAuthorizeOrderAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateAuthorizeOrderAction({
+            const aggregateResult = await repos.aggregateAction.aggregateAuthorizeOrderAction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -351,7 +351,7 @@ function aggregateUseAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateByTypeOf({
+            const aggregateResult = await repos.aggregateAction.aggregateByTypeOf({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -396,7 +396,7 @@ function aggregateReserveAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateByTypeOf({
+            const aggregateResult = await repos.aggregateAction.aggregateByTypeOf({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -441,7 +441,7 @@ function aggregateOrderAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateByTypeOf({
+            const aggregateResult = await repos.aggregateAction.aggregateByTypeOf({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -486,7 +486,7 @@ function aggregateCancelReservationAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateCancelReservationAction({
+            const aggregateResult = await repos.aggregateAction.aggregateCancelReservationAction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough
@@ -527,7 +527,7 @@ function aggregateCheckMovieTicketAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateCheckMovieTicketAction({
+            const aggregateResult = await repos.aggregateAction.aggregateCheckMovieTicketAction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough
@@ -568,7 +568,7 @@ function aggregatePayMovieTicketAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregatePayMovieTicketAction({
+            const aggregateResult = await repos.aggregateAction.aggregatePayMovieTicketAction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough

package/lib/chevre/service/offer/eventServiceByCOA/authorize.d.ts

@@ -1,4 +1,5 @@
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
+import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { CategoryCodeRepo } from '../../../repo/categoryCode';
 import type { EventRepo } from '../../../repo/event';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
@@ -10,7 +11,8 @@ import * as factory from '../../../factory';
 export { IRequestBody, IResponseBody };
 export type IAuthorizeActionResult = factory.action.authorize.offer.eventService.IResult;
 export interface IAuthorizeRepos {
-    action: ActionRepo;
+    action: AuthorizeOfferActionRepo;
+    accpetCOAOfferAction: AcceptCOAOfferActionRepo;
     categoryCode: CategoryCodeRepo;
     event: EventRepo;
     offer: OfferRepo;

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

@@ -32,18 +32,26 @@ const factory = __importStar(require("../../../factory"));
  */
 function authorizeByAcceptAction(params) {
     return async (repos) => {
-        const acceptAction = (await repos.action.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: params.project.id } },
-            id: { $in: [params.object.id] },
-            typeOf: { $eq: factory.actionType.AcceptAction },
-            purpose: { id: { $in: [params.purpose.id] } },
-            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }
-        }, ['result', 'object', 'potentialActions'])).shift();
-        if (acceptAction === undefined) {
-            throw new factory.errors.NotFound(factory.actionType.AcceptAction);
-        }
+        // const acceptAction = (<IAcceptAction[]>await repos.action.search(
+        //     {
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: params.project.id } },
+        //         id: { $in: [params.object.id] },
+        //         typeOf: { $eq: factory.actionType.AcceptAction },
+        //         purpose: { id: { $in: [params.purpose.id] } },
+        //         actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }
+        //     },
+        //     ['result', 'object', 'potentialActions']
+        // )).shift();
+        // if (acceptAction === undefined) {
+        //     throw new factory.errors.NotFound(factory.actionType.AcceptAction);
+        // }
+        const acceptAction = await repos.accpetCOAOfferAction.findCompletedById({
+            project: { id: params.project.id },
+            id: params.object.id,
+            purpose: { id: params.purpose.id },
+        }, ['result', 'object', 'potentialActions']);
         const acceptResult = acceptAction.result;
         if (acceptResult === undefined) {
             throw new factory.errors.NotFound(`${factory.actionType.AcceptAction}.result`);

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

@@ -32,6 +32,7 @@ const any_1 = require("../any");
 const factory_1 = require("./authorize/factory");
 const validateAcceptedOffers_1 = require("./authorize/validateAcceptedOffers");
 const factory = __importStar(require("../../../factory"));
+// type IAcceptAction = Pick<factory.action.accept.coaOffer.IAction, 'result'>;
 /**
  * COA興行オファー承認のオファーを変更
  */
@@ -61,13 +62,21 @@ function changeOffers(params) {
         if (typeof originalAcceptActionId !== 'string' || originalAcceptActionId === '') {
             throw new factory.errors.NotFound('authorizeAction.object.id');
         }
-        const originalAcceptResult = (await repos.action.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: authorizeAction.project.id } },
-            id: { $in: [originalAcceptActionId] },
-            typeOf: { $eq: factory.actionType.AcceptAction }
-        }, ['result'])).shift()?.result;
+        // const originalAcceptResult = (<IAcceptAction[]>await repos.action.search(
+        //     {
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: authorizeAction.project.id } },
+        //         id: { $in: [originalAcceptActionId] },
+        //         typeOf: { $eq: factory.actionType.AcceptAction }
+        //     },
+        //     ['result']
+        // )).shift()?.result;
+        const originalAcceptResult = (await repos.accpetCOAOfferAction.findCompletedById({
+            project: { id: authorizeAction.project.id },
+            id: originalAcceptActionId,
+            purpose: { id: authorizeAction.purpose.id },
+        }, ['result'])).result;
         if (originalAcceptResult === undefined) {
             throw new factory.errors.NotFound(`${factory.actionType.AcceptAction}.result`);
         }

package/package.json

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