@chevre/domain 21.32.0-alpha.16 → 21.32.0-alpha.18

package/example/src/chevre/transaction/acceptCOAOffer.ts

@@ -4,7 +4,7 @@ import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../../lib/index';
 
-// const project = { id: String(process.env.PROJECT_ID) };
+const project = { id: String(process.env.PROJECT_ID) };
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
@@ -36,18 +36,23 @@ async function main() {
                         kbnMgtk: ''
                     }
                 }
-            ]
+            ],
+            appliesToSurfrock: {
+                identifier: '',
+                serviceOutput: { typeOf: '' }
+            },
+            flgMember: COA.factory.reserve.FlgMember.NonMember,
+            typeOf: chevre.factory.offerType.AggregateOffer
         },
         agent: {
+            id: 'xxx',
             typeOf: chevre.factory.creativeWorkType.WebApplication
         },
-        purpose: { id: '664e80c79801179aabb0476f' },
-        appliesToSurfrock: {
-            identifier: '',
-            serviceOutput: { typeOf: '' }
-        },
-        flgMember: COA.factory.reserve.FlgMember.NonMember,
-        sameAs: { id: 'xxx' }
+        purpose: { id: '664e80c79801179aabb0476f', typeOf: chevre.factory.transactionType.PlaceOrder },
+        sameAs: { id: 'xxx', typeOf: 'Task' },
+        potentialActions: { typeOf: chevre.factory.actionType.AuthorizeAction },
+        typeOf: chevre.factory.actionType.AcceptAction,
+        project: { id: project.id, typeOf: chevre.factory.organizationType.Project }
     })({
         action: await chevre.repository.Action.createInstance(mongoose.connection),
         event: await chevre.repository.Event.createInstance(mongoose.connection),

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

@@ -49,6 +49,16 @@ interface IStatus {
 interface IAggregateAction {
     statuses: IStatus[];
 }
+export interface ICancelActionAction {
+    typeOf: factory.actionType.CancelAction;
+    agent: factory.action.IParticipantAsPerson | factory.action.IParticipantAsProject | factory.action.IParticipantAsWebApplication;
+    endTime: Date;
+    startTime: Date;
+    sameAs?: {
+        id: string;
+        typeOf: 'Task';
+    };
+}
 /**
  * アクションリポジトリ
  */
@@ -81,8 +91,9 @@ export declare class MongoRepository {
      * アクション取消
      */
     cancelWithVoid(params: {
-        typeOf: factory.actionType;
+        typeOf: factory.actionType.AuthorizeAction;
         id: string;
+        cancelAction?: Pick<ICancelActionAction, 'agent' | 'sameAs' | 'startTime'>;
     }): Promise<void>;
     /**
      * アクション失敗

package/lib/chevre/repo/action.js

@@ -505,19 +505,30 @@ class MongoRepository {
      */
     cancelWithVoid(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const cancelDate = new Date();
+            const cancelAction = (params.cancelAction !== undefined)
+                ? Object.assign(Object.assign({}, params.cancelAction), { endTime: cancelDate, typeOf: factory.actionType.CancelAction }) : undefined;
             const doc = yield this.actionModel.findOneAndUpdate({
                 _id: { $eq: params.id },
-                typeOf: { $eq: params.typeOf }
-            }, { $set: { actionStatus: factory.actionStatusType.CanceledActionStatus } }, { new: false, projection: { _id: 1 } })
+                typeOf: { $eq: params.typeOf },
+                actionStatus: { $ne: factory.actionStatusType.CanceledActionStatus } // 冪等性確保(2024-05-26~)
+            }, {
+                $set: Object.assign({ actionStatus: factory.actionStatusType.CanceledActionStatus }, (cancelAction !== undefined) ? { cancelAction } : undefined // cancelAction連携(2024-05-26~)
+                )
+            }, { new: false, projection: { _id: 1 } })
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.actionModel.modelName);
+                // 既にCanceledActionStatusであればok
+                const existingAction = yield this.findById({ id: params.id, typeOf: params.typeOf }, ['actionStatus'], []);
+                if (existingAction.actionStatus !== factory.actionStatusType.CanceledActionStatus) {
+                    throw new factory.errors.NotFound(this.actionModel.modelName);
+                }
             }
             // endDateが存在しなければセット(2024-04-22~)
             yield this.actionModel.updateOne({
                 _id: { $eq: params.id },
                 endDate: { $exists: false }
-            }, { $set: { endDate: new Date() } })
+            }, { $set: { endDate: cancelDate } })
                 .exec();
         });
     }

package/lib/chevre/repo/mongoose/schemas/action.js

@@ -27,7 +27,8 @@ const schemaDefinition = {
     location: mongoose_1.SchemaTypes.Mixed,
     replacer: mongoose_1.SchemaTypes.Mixed,
     targetCollection: mongoose_1.SchemaTypes.Mixed,
-    sameAs: mongoose_1.SchemaTypes.Mixed // タスク関連付けのために追加(2024-04-20~)
+    sameAs: mongoose_1.SchemaTypes.Mixed,
+    cancelAction: mongoose_1.SchemaTypes.Mixed // add(2024-05-26~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/service/offer/event/voidTransaction.d.ts

@@ -22,5 +22,12 @@ interface IVoidTransactionRepos {
  * 興行オファー承認取消(タスクから実行 or apiから実行))
  * 取引中の承認アクション全てについて処理する or 特定の承認アクションについて処理する
  */
-export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidReserveTransaction>): (repos: IVoidTransactionRepos) => Promise<void>;
+export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidReserveTransaction> & {
+    sameAs?: {
+        /**
+         * 実行元タスクID
+         */
+        id: string;
+    };
+}): (repos: IVoidTransactionRepos) => Promise<void>;
 export {};

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -22,12 +22,13 @@ exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
  */
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         // support void by action ID(2024-05-26~)
         if (typeof params.id === 'string') {
             yield (0, voidTransactionByActionId_1.voidTransactionByActionId)(params)(repos);
             return;
         }
+        const cancelAction = Object.assign({ startTime: new Date(), agent: { id: params.project.id, typeOf: factory.organizationType.Project } }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
         const transaction = yield repos.transaction.findById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id,
@@ -48,7 +49,7 @@ function voidTransaction(params) {
             // 確定取引に対応(2023-05-07~)
             case factory.transactionStatusType.Confirmed:
                 // OrderCancelledを考慮(2023-08-30~)
-                const orderCancelled = ((_b = (_a = params.purpose.result) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.orderStatus) === factory.orderStatus.OrderCancelled;
+                const orderCancelled = ((_c = (_b = params.purpose.result) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.orderStatus) === factory.orderStatus.OrderCancelled;
                 if (!orderCancelled) {
                     // 取り消すべきアクションに絞る
                     authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
@@ -76,7 +77,7 @@ function voidTransaction(params) {
             }
         }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
-            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
+            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             switch (action.instrument.identifier) {
                 case exports.WebAPIIdentifier.COA:
                     yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({

package/lib/chevre/service/offer/event/voidTransactionByActionId.d.ts

@@ -21,5 +21,12 @@ interface IVoidTransactionByActionIdRepos {
  * 興行オファー承認取消(apiから実行)
  * 特定の承認アクションについて処理する
  */
-declare function voidTransactionByActionId(params: factory.task.IData<factory.taskName.VoidReserveTransaction>): (repos: IVoidTransactionByActionIdRepos) => Promise<void>;
+declare function voidTransactionByActionId(params: factory.task.IData<factory.taskName.VoidReserveTransaction> & {
+    sameAs?: {
+        /**
+         * 実行元タスクID
+         */
+        id: string;
+    };
+}): (repos: IVoidTransactionByActionIdRepos) => Promise<void>;
 export { voidTransactionByActionId };

package/lib/chevre/service/offer/event/voidTransactionByActionId.js

@@ -35,9 +35,11 @@ function voidTransactionByActionId(params) {
     //     transaction: { id: string };
     // }) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (typeof params.id !== 'string' || params.id === '') {
             throw new factory.errors.ArgumentNull('id');
         }
+        const cancelAction = Object.assign({ startTime: new Date(), agent: { id: params.project.id, typeOf: factory.organizationType.Project } }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
@@ -51,7 +53,7 @@ function voidTransactionByActionId(params) {
         }
         // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
         // それだけは回避するためにMongoDBを先に変更
-        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id, cancelAction });
         // add orderInTransaction(2024-01-15~)
         // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
         const orderNumberByTransaction = transaction.object.orderNumber;

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

@@ -22,10 +22,5 @@ declare function acceptOffer(params: IAccepteOfferParams): (repos: IAcceptRepos)
 /**
  * COA興行オファー採用変更
  */
-declare function reAcceptOffer(params: IAccepteOfferParams & {
-    /**
-     * 元の承認アクションID
-     */
-    id: string;
-}): (repos: IAcceptRepos) => Promise<import("@chevre/factory/lib/action").IAction<import("@chevre/factory/lib/action").IAttributes<factory.actionType.AcceptAction, any, any>>>;
+declare function reAcceptOffer(params: IAccepteOfferParams & {}): (repos: IAcceptRepos) => Promise<import("@chevre/factory/lib/action").IAction<import("@chevre/factory/lib/action").IAttributes<factory.actionType.AcceptAction, any, any>>>;
 export { acceptOffer, reAcceptOffer };

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

@@ -87,15 +87,17 @@ function acceptOffer(params) {
         const actionAttributes = {
             project: transaction.project,
             typeOf: factory.actionType.AcceptAction,
-            object: {
-                object: params.object,
-                appliesToSurfrock: params.appliesToSurfrock,
-                flgMember: params.flgMember,
-                typeOf: factory.actionType.AuthorizeAction
-            },
+            // object: {
+            //     object: params.object,
+            //     appliesToSurfrock: params.appliesToSurfrock,
+            //     flgMember: params.flgMember,
+            //     typeOf: factory.actionType.AuthorizeAction
+            // },
+            object: params.object,
             agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
             purpose: { id: transaction.id, typeOf: transaction.typeOf },
-            sameAs: { id: params.sameAs.id, typeOf: 'Task' }
+            sameAs: { id: params.sameAs.id, typeOf: 'Task' },
+            potentialActions: params.potentialActions
         };
         let acceptedOffer;
         let requestBody;
@@ -107,9 +109,9 @@ function acceptOffer(params) {
                 coaInfo
             })({ reserveService: repos.reserveService });
             acceptedOffer = yield (0, authorize_1.validateOffers)(coaInfo, acceptedOffersWithoutDetails, {
-                identifier: params.appliesToSurfrock.identifier,
-                serviceOutput: { typeOf: params.appliesToSurfrock.serviceOutput.typeOf }
-            }, (params.agent.typeOf === factory.personType.Person), params.flgMember)({
+                identifier: params.object.appliesToSurfrock.identifier,
+                serviceOutput: { typeOf: params.object.appliesToSurfrock.serviceOutput.typeOf }
+            }, (params.agent.typeOf === factory.personType.Person), params.object.flgMember)({
                 reserveService: repos.reserveService,
                 masterService: repos.masterService
             });
@@ -160,16 +162,18 @@ function reAcceptOffer(params) {
         const actionAttributes = {
             project: transaction.project,
             typeOf: factory.actionType.AcceptAction,
-            object: {
-                object: params.object,
-                appliesToSurfrock: params.appliesToSurfrock,
-                flgMember: params.flgMember,
-                typeOf: factory.actionType.AuthorizeAction,
-                id: params.id
-            },
+            // object: {
+            //     object: params.object,
+            //     appliesToSurfrock: params.appliesToSurfrock,
+            //     flgMember: params.flgMember,
+            //     typeOf: factory.actionType.AuthorizeAction,
+            //     id: params.id
+            // },
+            object: params.object,
             agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
             purpose: { id: transaction.id, typeOf: transaction.typeOf },
-            sameAs: { id: params.sameAs.id, typeOf: 'Task' }
+            sameAs: { id: params.sameAs.id, typeOf: 'Task' },
+            potentialActions: params.potentialActions
         };
         let acceptedOffer;
         // let requestBody: COA.factory.reserve.IUpdTmpReserveSeatArgs;
@@ -181,9 +185,9 @@ function reAcceptOffer(params) {
                      }) });
             });
             acceptedOffer = yield (0, authorize_1.validateOffers)(coaInfo, acceptedOffersWithoutDetails, {
-                identifier: params.appliesToSurfrock.identifier,
-                serviceOutput: { typeOf: params.appliesToSurfrock.serviceOutput.typeOf }
-            }, (params.agent.typeOf === factory.personType.Person), params.flgMember)({
+                identifier: params.object.appliesToSurfrock.identifier,
+                serviceOutput: { typeOf: params.object.appliesToSurfrock.serviceOutput.typeOf }
+            }, (params.agent.typeOf === factory.personType.Person), params.object.flgMember)({
                 reserveService: repos.reserveService,
                 masterService: repos.masterService
             });

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

@@ -15,6 +15,9 @@ interface ICancelResult {
  * COA興行オファー承認取消
  */
 export declare function cancel(params: {
+    project: {
+        id: string;
+    };
     /**
      * 承認アクションID
      */

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

@@ -18,6 +18,10 @@ exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
  */
 function cancel(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const cancelAction = {
+            startTime: new Date(),
+            agent: { id: params.project.id, typeOf: factory.organizationType.Project }
+        };
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
@@ -30,7 +34,7 @@ function cancel(params) {
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
-        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id, cancelAction });
         // add orderInTransaction(2024-01-15~)
         // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
         const orderNumberByTransaction = transaction.object.orderNumber;

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

@@ -49,8 +49,10 @@ function call(params) {
                 endpoint: credentials_1.credentials.coa.endpoint,
                 auth: coaAuthClient
             }, { timeout: credentials_1.credentials.coa.timeout });
-            if (typeof params.data.id === 'string') {
-                yield (0, acceptOffer_1.reAcceptOffer)(Object.assign(Object.assign({}, params.data), { id: params.data.id, sameAs: { id: params.id } }))({
+            if (typeof params.data.potentialActions.id === 'string') {
+                yield (0, acceptOffer_1.reAcceptOffer)(Object.assign(Object.assign({}, params.data), { 
+                    // id: params.data.id,
+                    sameAs: { id: params.id, typeOf: 'Task' } }))({
                     action: actionRepo,
                     event: new event_1.MongoRepository(settings.connection),
                     transaction: new transaction_1.MongoRepository(settings.connection),
@@ -59,7 +61,7 @@ function call(params) {
                 });
             }
             else {
-                yield (0, acceptOffer_1.acceptOffer)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
+                yield (0, acceptOffer_1.acceptOffer)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } }))({
                     action: actionRepo,
                     event: new event_1.MongoRepository(settings.connection),
                     transaction: new transaction_1.MongoRepository(settings.connection),

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

@@ -39,7 +39,7 @@ function call(params) {
         }
         const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepository(settings.redisClient, { lockExpiresInSeconds: 120 });
         try {
-            yield (0, event_1.voidTransaction)(params.data)({
+            yield (0, event_1.voidTransaction)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
                 action: new action_1.MongoRepository(settings.connection),
                 assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
                 stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection),

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.371.0-alpha.3",
-    "@cinerino/sdk": "7.0.0-alpha.6",
+    "@chevre/factory": "4.371.0-alpha.4",
+    "@cinerino/sdk": "7.0.0-alpha.7",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.32.0-alpha.16"
+  "version": "21.32.0-alpha.18"
 }