@chevre/domain 21.30.0-alpha.35 → 21.30.0-alpha.37

package/lib/chevre/credentials.d.ts

@@ -52,5 +52,6 @@ export declare const credentials: {
          */
         issuers: string[];
         version: string;
+        payloadTypPrefix: string;
     };
 };

package/lib/chevre/credentials.js

@@ -64,6 +64,7 @@ exports.credentials = {
         issuers: (typeof process.env.TOKEN_ISSUERS_BY_AUTHORIZATION === 'string')
             ? process.env.TOKEN_ISSUERS_BY_AUTHORIZATION.split(' ')
             : [],
-        version: (typeof process.env.TOKEN_VERSION === 'string') ? process.env.TOKEN_VERSION : '2024-05-02' // 追加(2024-05-02~)
+        version: (typeof process.env.TOKEN_VERSION === 'string') ? process.env.TOKEN_VERSION : '2024-05-02',
+        payloadTypPrefix: (typeof process.env.TOKEN_PAYLOAD_TYP_PREFIX === 'string') ? process.env.TOKEN_PAYLOAD_TYP_PREFIX : 'chevre'
     }
 };

package/lib/chevre/service/code.d.ts

@@ -9,11 +9,11 @@ interface IPayload {
     iss: string;
     exp: number;
     version: string;
-    'chevre:typeOf': factory.authorization.IAuthorization['typeOf'];
+    typ: string;
 }
 type IPayloadWithNoVersion = factory.authorization.IObject & {
     version?: never;
-    'chevre:typeOf'?: never;
+    typ?: never;
 };
 /**
  * コードをトークンに変換する
@@ -45,5 +45,5 @@ declare function verifyToken(params: {
 }): (repos: {
     action?: ActionRepo;
     authorization: AuthorizationRepo;
-}) => Promise<factory.authorization.IObject>;
+}) => Promise<factory.authorization.IObject | import("@chevre/factory/lib/action/authorize/offer/eventService").IPurpose>;
 export { IToken, ICode, IPayload, IPayloadWithNoVersion, getToken, verifyToken };

package/lib/chevre/service/code.js

@@ -33,10 +33,12 @@ function getToken(params) {
             project: { id: params.project.id },
             code: params.code
         });
-        const isAuthorize4order = (!Array.isArray(authorization.object) && authorization.object.typeOf === factory.order.OrderType.Order);
+        const isAuthorize4order = authorization.object.typeOf === factory.order.OrderType.Order;
         const payload = Object.assign(Object.assign({}, (settings_1.USE_TOKEN_WITH_NO_VERSION && isAuthorize4order) ? authorization.object : undefined), { 
             // sub: authorization.id, // 拡張(2024-05-01~)
-            token_use: 'access', version: credentials_1.credentials.jwt.version, 'chevre:typeOf': authorization.typeOf // 拡張(2024-05-01~)
+            token_use: 'access', version: credentials_1.credentials.jwt.version, 
+            // 'chevre:typeOf': authorization.typeOf // 拡張(2024-05-01~)
+            typ: `${credentials_1.credentials.jwt.payloadTypPrefix}:${authorization.typeOf}` //  拡張(2024-05-07~)
          });
         if (typeof params.issuer !== 'string' || params.issuer.length === 0) {
             throw new factory.errors.ArgumentNull('issuer');
@@ -120,11 +122,26 @@ function verifyToken(params) {
             if (typeof payload.sub !== 'string' || payload.sub.length === 0) {
                 throw new factory.errors.Unauthorized(`invalid token [sub:${payload.sub}]`);
             }
-            const { object } = yield repos.authorization.findValidOneById({
-                project: { id: params.project.id },
-                id: payload.sub
-            });
-            result = object;
+            // sskts.purposeTokenに対応
+            let resourceTypeByPayload;
+            if (typeof payload.typ === 'string') {
+                resourceTypeByPayload = payload.typ.split(`${credentials_1.credentials.jwt.payloadTypPrefix}:`)
+                    .at(1);
+            }
+            if (resourceTypeByPayload === factory.transactionType.PlaceOrder) {
+                result = {
+                    id: payload.sub,
+                    typeOf: resourceTypeByPayload
+                };
+            }
+            else {
+                // 基本的には承認を参照
+                const { object } = yield repos.authorization.findValidOneById({
+                    project: { id: params.project.id },
+                    id: payload.sub
+                });
+                result = object;
+            }
         }
         else {
             // NO_VERSIONを廃止(2024-05-06~)

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered.d.ts

@@ -2,7 +2,7 @@ import * as factory from '../../../factory';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'potentialActions'>;
 declare function onOrderDelivered(params: {
-    order: Pick<factory.order.IOrder, 'id' | 'customer' | 'orderDate' | 'orderNumber' | 'project' | 'typeOf'> & {
+    order: Pick<factory.order.IOrder, 'id' | 'customer' | 'orderDate' | 'orderNumber' | 'project' | 'typeOf' | 'price' | 'priceCurrency'> & {
         orderStatus: factory.orderStatus.OrderDelivered;
     };
     placeOrderTransaction?: IPlaceOrderTransaction;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered.js

@@ -39,7 +39,10 @@ function onOrderDelivered(params) {
         yield repos.task.saveMany(tasks, { emitImmediately: true });
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderDelivered:
-                yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({ potentialActions: sendOrderPotentialActions })(repos);
+                yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({
+                    potentialActions: sendOrderPotentialActions,
+                    order: params.order
+                })(repos);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.d.ts

@@ -2,6 +2,7 @@ import type { MongoRepository as TaskRepo } from '../../../../repo/task';
 import * as factory from '../../../../factory';
 declare function createSendEmailMessageTaskIfNotExist(params: {
     potentialActions?: factory.action.transfer.send.order.IPotentialActions;
+    order: Pick<factory.order.IOrder, 'customer' | 'orderDate' | 'orderNumber' | 'price' | 'priceCurrency' | 'project' | 'typeOf'>;
 }): (repos: {
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.js

@@ -19,19 +19,40 @@ function createSendEmailMessageTaskIfNotExist(params) {
         const now = new Date();
         if (Array.isArray(sendEmailMessageActions)) {
             yield Promise.all(sendEmailMessageActions.map((sendEmailMessageAction, index) => __awaiter(this, void 0, void 0, function* () {
-                const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', sendEmailMessageAction.project.id, factory.taskName.SendEmailMessage, sendEmailMessageAction.purpose.typeOf, sendEmailMessageAction.purpose.orderNumber, factory.orderStatus.OrderProcessing, index);
+                const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', 
+                // sendEmailMessageAction.project.id,
+                params.order.project.id, factory.taskName.SendEmailMessage, 
+                // sendEmailMessageAction.purpose.typeOf,
+                // sendEmailMessageAction.purpose.orderNumber,
+                params.order.typeOf, params.order.orderNumber, factory.orderStatus.OrderProcessing, index);
+                // const actionAttributes: factory.task.sendEmailMessage.IData['actionAttributes'] = sendEmailMessageAction;
+                const simpleOrder = {
+                    typeOf: params.order.typeOf,
+                    orderNumber: params.order.orderNumber,
+                    price: params.order.price,
+                    priceCurrency: params.order.priceCurrency,
+                    orderDate: params.order.orderDate
+                };
+                const actionAttributes = {
+                    project: params.order.project,
+                    typeOf: factory.actionType.SendAction,
+                    object: sendEmailMessageAction.object,
+                    agent: params.order.project,
+                    recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
+                    potentialActions: {},
+                    purpose: simpleOrder
+                };
                 const sendEmailMessageTask = {
                     identifier: taskIdentifier,
-                    project: sendEmailMessageAction.project,
+                    // project: sendEmailMessageAction.project,
+                    project: params.order.project,
                     name: factory.taskName.SendEmailMessage,
                     status: factory.taskStatus.Ready,
                     runsAt: now,
                     remainingNumberOfTries: 10,
                     numberOfTried: 0,
                     executionResults: [],
-                    data: {
-                        actionAttributes: sendEmailMessageAction
-                    }
+                    data: { actionAttributes }
                 };
                 yield repos.task.createIfNotExistByIdentifier(sendEmailMessageTask, { emitImmediately: true });
             })));

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js

@@ -70,7 +70,10 @@ function onOrderProcessing(params) {
                 // })(repos);
                 // OrderProcessingにおけるEメール送信に対応(2024-01-17~)
                 if (settings_1.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING) {
-                    yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({ potentialActions: sendOrderPotentialActions })(repos);
+                    yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({
+                        potentialActions: sendOrderPotentialActions,
+                        order: params.order
+                    })(repos);
                 }
                 break;
             default:

package/lib/chevre/service/order/sendOrder.js

@@ -155,7 +155,9 @@ function sendOrder(params) {
                             orderNumber: order.orderNumber,
                             project: order.project,
                             typeOf: order.typeOf,
-                            orderStatus: factory.orderStatus.OrderDelivered
+                            orderStatus: factory.orderStatus.OrderDelivered,
+                            price: order.price,
+                            priceCurrency: order.priceCurrency
                         },
                         placeOrderTransaction
                     })({

package/lib/chevre/service/reserve/findByCode.js

@@ -25,9 +25,6 @@ function findByCode(params) {
             project: { id: params.project.id },
             code: params.code
         });
-        if (Array.isArray(authorization.object)) {
-            throw new factory.errors.NotImplemented('payload as an array not implemented');
-        }
         switch (authorization.object.typeOf) {
             case factory.order.OrderType.Order:
                 const { orderNumber } = authorization.object;

package/lib/chevre/service/reserve/useReservation.js

@@ -21,50 +21,36 @@ const debug = createDebug('chevre-domain:service:reserve:useReservation');
 // tslint:disable-next-line:max-func-body-length
 function useReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const now = new Date();
         const reservationId = params.object.id;
         const ticketToken = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.ticketToken;
         const token = (_b = params === null || params === void 0 ? void 0 : params.instrument) === null || _b === void 0 ? void 0 : _b.token;
-        // タスク作成前に検証済なので検証不要
-        // if (params.verifyToken === true) {
-        //     // instrument?.tokenを検証
-        //     if (typeof token === 'string') {
-        //         await verifyToken4reservation({
-        //             project: { id: params.project.id },
-        //             agent: params.agent,
-        //             reservationId,
-        //             token
-        //         })({ order: repos.order });
-        //     }
-        // }
+        // if (params.verifyToken === true) {} // タスク作成前に検証済なので検証不要
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
         yield reserveIfNotYet({ object: params.object })(repos);
         // 予約検索
-        // 取得属性最適化(2023-01-30~)
         const reservation = yield repos.reservation.findById({
             id: reservationId,
             inclusion: ['_id', 'issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
         });
         // UseActionを作成する
+        // optimize(2024-05-07~)
+        // const reservationAsObject: IReservationAsUseObject = {
+        //     id: reservation.id, issuedThrough: reservation.issuedThrough, reservationFor: reservation.reservationFor,
+        //     reservationNumber: reservation.reservationNumber, reservedTicket: reservation.reservedTicket, typeOf: reservation.typeOf
+        // };
+        const { reservedTicket } = reservation;
         const reservationAsObject = {
             id: reservation.id,
-            issuedThrough: reservation.issuedThrough,
-            reservationFor: reservation.reservationFor,
             reservationNumber: reservation.reservationNumber,
-            reservedTicket: reservation.reservedTicket,
-            typeOf: reservation.typeOf
+            typeOf: reservation.typeOf,
+            issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
+            reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf },
+            reservedTicket: Object.assign(Object.assign({ typeOf: reservedTicket.typeOf, ticketType: Object.assign({ identifier: reservedTicket.ticketType.identifier, typeOf: reservedTicket.ticketType.typeOf }, (typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined) }, (typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined), (typeof ((_c = reservedTicket.ticketedSeat) === null || _c === void 0 ? void 0 : _c.typeOf) === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined)
         };
-        const actionAttributes = Object.assign({ project: reservation.project, typeOf: factory.actionType.UseAction, agent: params.agent, instrument: Object.assign(Object.assign(Object.assign({}, (typeof token === 'string') ? { token } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }), 
-            // object最適化(2023-01-30~)
-            // どの予約を
-            object: [reservationAsObject] }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
-            ? {
-                location: {
-                    typeOf: factory.placeType.Place,
-                    identifier: params.location.identifier
-                }
-            }
+        const actionAttributes = Object.assign({ project: reservation.project, typeOf: factory.actionType.UseAction, agent: params.agent, instrument: Object.assign(Object.assign(Object.assign({}, (typeof token === 'string') ? { token } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }), object: [reservationAsObject] }, (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.identifier) === 'string')
+            ? { location: { typeOf: factory.placeType.Place, identifier: params.location.identifier } }
             : undefined);
         const action = yield repos.action.start(actionAttributes);
         // ひとまず予約数:1に限定する
@@ -85,10 +71,8 @@ function useReservation(params) {
             }
             throw error;
         }
-        // アクション完了
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
         yield (0, onReservationUsed_1.onReservationUsed)(attendedReservation)({ task: repos.task });
-        // return action;
     });
 }
 exports.useReservation = useReservation;

package/lib/chevre/service/reserve/verifyToken4reservation.js

@@ -37,9 +37,6 @@ function verifyToken4reservation(params) {
         else {
             throw new factory.errors.ArgumentNull('ticket.token or ticket.ticketToken');
         }
-        if (Array.isArray(payload)) {
-            throw new factory.errors.NotImplemented('payload as an array not implemented');
-        }
         switch (payload.typeOf) {
             case factory.order.OrderType.Order:
                 const { orderNumber } = payload;

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

@@ -53,9 +53,6 @@ function onAuthorizationCreated(params) {
             code: params.code,
             project: { id: params.project.id }
         });
-        if (Array.isArray(authorization.object)) {
-            return;
-        }
         switch (authorization.object.typeOf) {
             case factory.order.OrderType.Order:
                 // 注文検索

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.d.ts

@@ -6,5 +6,5 @@ export declare function createSendEmailMessageActions(params: {
     useOptimizedSendEmailAction: boolean;
 }): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
-    sendEmailMessageActions: factory.action.transfer.send.message.email.IAttributes[];
+    sendEmailMessageActions: factory.action.transfer.send.order.ISendEmailMessage[];
 }>;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.js

@@ -17,14 +17,15 @@ function createSendEmailMessageActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         // 注文配送メール送信設定
         const emailMessages = [];
+        // const sendEmailMessageActions: factory.action.transfer.send.message.email.IAttributes[] = [];
         const sendEmailMessageActions = [];
-        const sendActionPurpose = {
-            typeOf: params.order.typeOf,
-            orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
-            orderDate: params.order.orderDate
-        };
+        // const sendActionPurpose: factory.action.transfer.send.message.email.IPurpose = {
+        //     typeOf: params.order.typeOf,
+        //     orderNumber: params.order.orderNumber,
+        //     price: params.order.price,
+        //     priceCurrency: params.order.priceCurrency,
+        //     orderDate: params.order.orderDate
+        // };
         const sendEmailMessageOnOrderSentParams = (_e = (_d = (_c = (_b = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.potentialActions) === null || _c === void 0 ? void 0 : _c.sendOrder) === null || _d === void 0 ? void 0 : _d.potentialActions) === null || _e === void 0 ? void 0 : _e.sendEmailMessage;
         if (Array.isArray(sendEmailMessageOnOrderSentParams)) {
             yield Promise.all(sendEmailMessageOnOrderSentParams.map((s, index) => __awaiter(this, void 0, void 0, function* () {
@@ -38,17 +39,18 @@ function createSendEmailMessageActions(params) {
                         typeOf: factory.creativeWorkType.EmailMessage
                     };
                 }
+                // optimize(2024-05-07~)
                 sendEmailMessageActions.push({
-                    project: params.order.project,
-                    typeOf: factory.actionType.SendAction,
-                    object: sendEmailMessageActionObject,
-                    agent: params.order.project,
-                    recipient: {
-                        typeOf: params.order.customer.typeOf,
-                        id: params.order.customer.id
-                    },
-                    potentialActions: {},
-                    purpose: sendActionPurpose
+                    // project: params.order.project,
+                    // typeOf: factory.actionType.SendAction,
+                    object: sendEmailMessageActionObject
+                    // agent: params.order.project,
+                    // recipient: {
+                    //     typeOf: params.order.customer.typeOf,
+                    //     id: params.order.customer.id
+                    // },
+                    // potentialActions: {},
+                    // purpose: sendActionPurpose
                 });
             })));
         }

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.369.0-alpha.7",
+    "@chevre/factory": "4.369.0-alpha.9",
     "@cinerino/sdk": "5.18.0-alpha.19",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.30.0-alpha.35"
+  "version": "21.30.0-alpha.37"
 }