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

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() {
@@ -44,15 +44,15 @@ async function main() {
             flgMember: COA.factory.reserve.FlgMember.NonMember,
             typeOf: chevre.factory.offerType.AggregateOffer
         },
-        agent: {
-            id: 'xxx',
-            typeOf: chevre.factory.creativeWorkType.WebApplication
-        },
+        // agent: {
+        //     id: 'xxx',
+        //     typeOf: chevre.factory.creativeWorkType.WebApplication
+        // },
         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 }
+        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/service/code.d.ts

@@ -51,5 +51,5 @@ declare function verifyToken(params: {
     action?: ActionRepo;
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
-}) => Promise<factory.authorization.IObject | import("@chevre/factory/lib/action/authorize/offer/eventService").IPurpose>;
+}) => Promise<factory.authorization.IObject | import("@chevre/factory/lib/action/accept/coaOffer").IPurpose>;
 export { IToken, ICode, IPayload, IPayloadWithNoVersion, getToken, verifyToken };

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

@@ -82,12 +82,12 @@ function processVoidTransaction4coa(params) {
 }
 exports.processVoidTransaction4coa = processVoidTransaction4coa;
 function processVoidTransactionByAcceptAction4coa(params) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
         // COAの場合、objectあるいはresultに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
         let delTmpReserveParams;
-        const coaRequestBody = (_a = params.action.result) === null || _a === void 0 ? void 0 : _a.result.requestBody;
-        const coaResponseBody = (_b = params.action.result) === null || _b === void 0 ? void 0 : _b.result.responseBody;
+        const coaRequestBody = (_b = (_a = params.action.result) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.requestBody;
+        const coaResponseBody = (_d = (_c = params.action.result) === null || _c === void 0 ? void 0 : _c.result) === null || _d === void 0 ? void 0 : _d.responseBody;
         if (coaRequestBody !== undefined && coaResponseBody !== undefined) {
             delTmpReserveParams = {
                 theaterCode: coaRequestBody.theaterCode,

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

@@ -135,14 +135,16 @@ function cancelAcceptActions(params) {
                 if (!orderCancelled) {
                     // 取り消すべきアクションに絞る
                     acceptActions = acceptActions.filter((acceptAction) => {
-                        var _a, _b;
+                        var _a, _b, _c;
+                        const tmpReserveNum = (_c = (_b = (_a = acceptAction.result) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.responseBody) === null || _c === void 0 ? void 0 : _c.tmpReserveNum;
+                        const potentialActionsId = acceptAction.potentialActions.id;
                         // 仮予約番号が発行済、かつ、承認完了済のアクションは除外
-                        const tmpReserveNum = (_b = (_a = acceptAction.result) === null || _a === void 0 ? void 0 : _a.result.responseBody) === null || _b === void 0 ? void 0 : _b.tmpReserveNum;
-                        const completedAuthorizeActionExists = typeof tmpReserveNum === 'string'
-                            && completedAuthorizeActions.some(({ instrument }) => {
-                                return instrument.transactionNumber === tmpReserveNum;
-                            });
-                        return !completedAuthorizeActionExists;
+                        const authorizeActionExistsByTmpReserveNum = typeof tmpReserveNum === 'string'
+                            && completedAuthorizeActions.some(({ instrument }) => instrument.transactionNumber === tmpReserveNum);
+                        // 承認アクションIDが連携(再採用)、かつ、承認完了済のアクションは除外
+                        const authorizeActionExistsByPotentialActionsId = typeof potentialActionsId === 'string'
+                            && completedAuthorizeActions.some(({ id }) => id === potentialActionsId);
+                        return !authorizeActionExistsByTmpReserveNum && !authorizeActionExistsByPotentialActionsId;
                     });
                 }
                 break;

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

@@ -16,7 +16,7 @@ export declare function createAcceptedOffersWithoutDetails(params: {
     reserveService: COA.service.Reserve;
 }) => Promise<IAcceptedOfferWithoutDetail[]>;
 type IAcceptedOfferBeforeAuthorize4COA = factory.action.authorize.offer.eventService.IAcceptedOfferBeforeAuthorize4COA;
-export declare function validateOffers(coaInfo: Pick<factory.event.screeningEvent.ICOAInfo, 'dateJouei' | 'screenCode' | 'theaterCode' | 'timeBegin' | 'timeEnd' | 'titleBranchNum' | 'titleCode'>, offers: IAcceptedOfferWithoutDetail[], appliesToSurfrock: IAppliesToSurfrock, isMember: boolean, flgMember: COA.factory.reserve.FlgMember): (repos: {
+export declare function validateOffers(coaInfo: Pick<factory.event.screeningEvent.ICOAInfo, 'dateJouei' | 'screenCode' | 'theaterCode' | 'timeBegin' | 'timeEnd' | 'titleBranchNum' | 'titleCode'>, offers: IAcceptedOfferWithoutDetail[], appliesToSurfrock: IAppliesToSurfrock, flgMember: COA.factory.reserve.FlgMember): (repos: {
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;
 }) => Promise<IAcceptedOfferBeforeAuthorize4COA[]>;

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOffers = exports.createAcceptedOffersWithoutDetails = exports.WebAPIIdentifier = void 0;
+const COA = require("@motionpicture/coa-service");
 const http_status_1 = require("http-status");
 const errorHandler_1 = require("../../../../errorHandler");
 const factory = require("../../../../factory");
@@ -215,7 +216,9 @@ function availableSalesTicket2offerWithDetails(params) {
     }
     return offerWithDetails;
 }
-function validateOffers(coaInfo, offers, appliesToSurfrock, isMember, flgMember) {
+function validateOffers(coaInfo, offers, appliesToSurfrock, 
+// isMember: boolean, // flgMemberと重複なので不要(2024-05-27~)
+flgMember) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let availableSalesTickets = [];
         try {
@@ -247,7 +250,7 @@ function validateOffers(coaInfo, offers, appliesToSurfrock, isMember, flgMember)
                 offer,
                 offerIndex,
                 appliesToSurfrock,
-                isMember
+                isMember: (flgMember === COA.factory.reserve.FlgMember.Member)
             });
         })));
     });

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

@@ -10,7 +10,7 @@ interface IAcceptRepos {
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;
 }
-type IAccepteOfferParams = factory.task.acceptCOAOffer.IData & {
+type IAccepteOfferParams = Pick<factory.task.acceptCOAOffer.IData, 'object' | 'potentialActions' | 'purpose' | 'sameAs'> & {
     sameAs: {
         id: string;
     };
@@ -22,5 +22,12 @@ declare function acceptOffer(params: IAccepteOfferParams): (repos: IAcceptRepos)
 /**
  * COA興行オファー採用変更
  */
-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>>>;
+declare function reAcceptOffer(params: IAccepteOfferParams & {
+    potentialActions: factory.task.acceptCOAOffer.IData['potentialActions'] & {
+        /**
+         * 元の承認アクションID
+         */
+        id: string;
+    };
+}): (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

@@ -10,47 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reAcceptOffer = exports.acceptOffer = void 0;
-const authorize_1 = require("./acceptOffer/authorize");
-const factory_1 = require("./acceptOffer/factory");
-// import { credentials } from '../../../credentials';
 const errorHandler_1 = require("../../../errorHandler");
 const factory = require("../../../factory");
-// let jwt: typeof JWT | undefined;
-// async function getPurposeToken(params: {
-//     id: string;
-// }): Promise<string> {
-//     const data: Pick<factory.clientUser.IClientUser, 'sub' | 'typ' | 'token_use' | 'version'> = {
-//         sub: params.id,
-//         token_use: 'access',
-//         version: credentials.jwt.version,
-//         typ: `${credentials.jwt.payloadTypPrefix}:${factory.transactionType.PlaceOrder}`
-//     };
-//     return new Promise<string>(async (resolve, reject) => {
-//         if (jwt === undefined) {
-//             jwt = await import('jsonwebtoken');
-//         }
-//         jwt.sign(
-//             data,
-//             credentials.jwt.secret,
-//             {
-//                 algorithm: 'HS256', // 明示的に指定(2024-05-07~)
-//                 issuer: credentials.jwt.issuer,
-//                 expiresIn: 60
-//             },
-//             (err, encoded) => {
-//                 if (err instanceof Error) {
-//                     reject(err);
-//                 } else {
-//                     if (typeof encoded !== 'string') {
-//                         reject(new factory.errors.ServiceUnavailable('purpose cannot be signed unexpectedly'));
-//                     } else {
-//                         resolve(encoded);
-//                     }
-//                 }
-//             }
-//         );
-//     });
-// }
+const authorize_1 = require("./acceptOffer/authorize");
+const factory_1 = require("./acceptOffer/factory");
 function findCOAInfo(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const searchConditions = {
@@ -76,6 +39,9 @@ function findCOAInfo(params) {
  */
 function acceptOffer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (typeof params.sameAs.id !== 'string' || params.sameAs.id === '') {
+            throw new factory.errors.ArgumentNull('sameAs.id');
+        }
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
@@ -87,12 +53,6 @@ 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: params.object,
             agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
             purpose: { id: transaction.id, typeOf: transaction.typeOf },
@@ -111,7 +71,9 @@ function acceptOffer(params) {
             acceptedOffer = yield (0, authorize_1.validateOffers)(coaInfo, acceptedOffersWithoutDetails, {
                 identifier: params.object.appliesToSurfrock.identifier,
                 serviceOutput: { typeOf: params.object.appliesToSurfrock.serviceOutput.typeOf }
-            }, (params.agent.typeOf === factory.personType.Person), params.object.flgMember)({
+            }, 
+            // (params.agent.typeOf === factory.personType.Person),
+            params.object.flgMember)({
                 reserveService: repos.reserveService,
                 masterService: repos.masterService
             });
@@ -137,8 +99,6 @@ function acceptOffer(params) {
                 acceptedOffer,
                 event: { id: params.object.event.id }
             },
-            // purpose: await getPurposeToken({ id: params.purpose.id }),
-            // purposeRaw: params.purpose.id,
             result: { requestBody, responseBody },
             typeOf: factory.actionType.AuthorizeAction
         };
@@ -151,6 +111,13 @@ exports.acceptOffer = acceptOffer;
  */
 function reAcceptOffer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        if (typeof params.sameAs.id !== 'string' || params.sameAs.id === '') {
+            throw new factory.errors.ArgumentNull('sameAs.id');
+        }
+        if (typeof ((_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.id) !== 'string' || params.potentialActions.id === '') {
+            throw new factory.errors.ArgumentNull('potentialActions.id');
+        }
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
@@ -159,16 +126,11 @@ function reAcceptOffer(params) {
             id: params.object.event.id,
             project: { id: transaction.project.id }
         })(repos);
+        // 承認アクション存在検証
+        yield repos.action.findById({ id: params.potentialActions.id, typeOf: factory.actionType.AuthorizeAction }, ['_id'], []);
         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: params.object,
             agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
             purpose: { id: transaction.id, typeOf: transaction.typeOf },
@@ -176,18 +138,18 @@ function reAcceptOffer(params) {
             potentialActions: params.potentialActions
         };
         let acceptedOffer;
-        // let requestBody: COA.factory.reserve.IUpdTmpReserveSeatArgs;
-        // let responseBody: COA.factory.reserve.IUpdTmpReserveSeatResult;
         const action = yield repos.action.start(actionAttributes);
         try {
             const acceptedOffersWithoutDetails = params.object.acceptedOffer.map((offer) => {
-                return Object.assign(Object.assign({}, offer), { ticketInfo: Object.assign(Object.assign({}, offer.ticketInfo), { spseatAdd1: 0, spseatAdd2: 0, spseatKbn: '' // chevreで上書きされるので問題なし
+                return Object.assign(Object.assign({}, offer), { ticketInfo: Object.assign(Object.assign({}, offer.ticketInfo), { spseatAdd1: 0, spseatAdd2: 0, spseatKbn: '' // 承認時に上書きされるので問題なし
                      }) });
             });
             acceptedOffer = yield (0, authorize_1.validateOffers)(coaInfo, acceptedOffersWithoutDetails, {
                 identifier: params.object.appliesToSurfrock.identifier,
                 serviceOutput: { typeOf: params.object.appliesToSurfrock.serviceOutput.typeOf }
-            }, (params.agent.typeOf === factory.personType.Person), params.object.flgMember)({
+            }, 
+            // (params.agent.typeOf === factory.personType.Person),
+            params.object.flgMember)({
                 reserveService: repos.reserveService,
                 masterService: repos.masterService
             });
@@ -202,16 +164,11 @@ function reAcceptOffer(params) {
             throw error;
         }
         const result = {
+            id: params.potentialActions.id,
             object: {
                 acceptedOffer,
                 event: { id: params.object.event.id }
             },
-            // purpose: await getPurposeToken({ id: params.purpose.id }),
-            // purposeRaw: params.purpose.id,
-            result: {
-            // requestBody,
-            // responseBody
-            },
             typeOf: factory.actionType.AuthorizeAction
         };
         return repos.action.complete({ typeOf: action.typeOf, id: action.id, result });

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

@@ -49,10 +49,14 @@ function call(params) {
                 endpoint: credentials_1.credentials.coa.endpoint,
                 auth: coaAuthClient
             }, { timeout: credentials_1.credentials.coa.timeout });
-            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' } }))({
+            const { object, potentialActions, purpose } = params.data;
+            if (typeof potentialActions.id === 'string') {
+                yield (0, acceptOffer_1.reAcceptOffer)({
+                    object,
+                    purpose,
+                    potentialActions: Object.assign(Object.assign({}, potentialActions), { id: potentialActions.id }),
+                    sameAs: { id: params.id, typeOf: 'Task' }
+                })({
                     action: actionRepo,
                     event: new event_1.MongoRepository(settings.connection),
                     transaction: new transaction_1.MongoRepository(settings.connection),
@@ -61,7 +65,12 @@ function call(params) {
                 });
             }
             else {
-                yield (0, acceptOffer_1.acceptOffer)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } }))({
+                yield (0, acceptOffer_1.acceptOffer)({
+                    object,
+                    potentialActions,
+                    purpose,
+                    sameAs: { id: params.id, typeOf: 'Task' }
+                })({
                     action: actionRepo,
                     event: new event_1.MongoRepository(settings.connection),
                     transaction: new transaction_1.MongoRepository(settings.connection),

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.371.0-alpha.4",
-    "@cinerino/sdk": "7.0.0-alpha.8",
+    "@chevre/factory": "4.371.0-alpha.5",
+    "@cinerino/sdk": "7.0.0-alpha.9",
     "@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.20"
+  "version": "21.32.0-alpha.21"
 }