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

package/example/src/chevre/project/unsetProjectSettings.ts

@@ -11,7 +11,13 @@ async function main() {
 
     const cursor = projectRepo.getCursor(
         {
-            _id: { $nin: ['ttts-development', 'sskts-development'] }
+            _id: {
+                $nin: [
+                    'ttts-development', 'sskts-development',
+                    'ttts-test', 'sskts-test',
+                    'ttts-production', 'sskts-production'
+                ]
+            }
         },
         {
             _id: 1,

package/example/src/chevre/roles/{addAdminSellerEventIfNotExists.ts → addAdminSellerEventOfferIfNotExists.ts}

@@ -14,7 +14,7 @@ async function main() {
         chevre.factory.role.organizationRole.RoleName.SellersInventoryManager
     ];
     const permissions = [
-        'admin.sellers.events.*'
+        'admin.sellers.eventOffers.*'
     ];
     for (const roleName of roleNames) {
         for (const permission of permissions) {

package/lib/chevre/service/assetTransaction/pay/factory.d.ts

@@ -14,7 +14,7 @@ export declare function createStartParams(params: factory.assetTransaction.pay.I
          */
         id: string;
     }[];
-    instrument: factory.action.trade.pay.IInstrument[];
+    instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
 }, options: {
     checkedAction: {
         id: string;

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -105,7 +105,7 @@ export import IPaymentAgencyTransaction = CreditCardPayment.IPaymentAgencyTransa
  * 取引開始
  */
 export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail & {
-    instrument: factory.action.trade.pay.IInstrument[];
+    instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
 }, options: {
     pendingPaymentAgencyTransaction?: CreditCardPayment.IPaymentAgencyTransaction;
     /**

package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.d.ts

@@ -32,6 +32,10 @@ declare function fixTransactionNumber(params: {
      * 承認時に指定のチケット、あるいは、決済採用時に指定のチケット
      */
     invoiceByTicketToken?: IInvoiceByTicketToken;
+    /**
+     * 承認時に指定のチケット、あるいは、決済採用時に指定のチケット
+     */
+    ticketToken?: string;
     permitOrInvoice?: never;
     id?: never;
 } | {

package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.js

@@ -25,6 +25,7 @@ function fixTransactionNumber(params) {
         let pendingPaymentAgencyTransaction;
         let creditCard = object.creditCard;
         let invoiceByTicketToken;
+        let ticketToken;
         // ticketTokenを解釈(2024-08-13~)
         const { verifyPaymentMethodTicketResult } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
             project: { id: transaction.project.id },
@@ -50,6 +51,7 @@ function fixTransactionNumber(params) {
                 if (typeof paymentMethodIdByTicketToken === 'string') {
                     transactionNumber = paymentMethodIdByTicketToken;
                     invoiceByTicketToken = verifyPaymentMethodTicketResult.invoiceByTicketToken;
+                    ticketToken = verifyPaymentMethodTicketResult.ticketToken;
                 }
             }
         }
@@ -77,6 +79,7 @@ function fixTransactionNumber(params) {
                 pendingPaymentAgencyTransaction = authorizeParams.pendingPaymentAgencyTransaction;
                 if (typeof ((_f = authorizeParams.acceptAction2ticketResult) === null || _f === void 0 ? void 0 : _f.ticketToken) === 'string') {
                     invoiceByTicketToken = authorizeParams.acceptAction2ticketResult.invoiceByTicketToken;
+                    ticketToken = authorizeParams.acceptAction2ticketResult.ticketToken;
                 }
             }
             else {
@@ -88,7 +91,8 @@ function fixTransactionNumber(params) {
             const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
-        return Object.assign(Object.assign(Object.assign({ transactionNumber }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined), (invoiceByTicketToken !== undefined) ? { invoiceByTicketToken } : undefined
+        return Object.assign(Object.assign(Object.assign({ transactionNumber,
+            ticketToken }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined), (invoiceByTicketToken !== undefined) ? { invoiceByTicketToken } : undefined
         // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
         );
     });

package/lib/chevre/service/payment/any/factory.d.ts

@@ -35,9 +35,13 @@ export declare function creatPayTransactionStartParams(params: {
         confirmationNumber: string;
         orderNumber: string;
     };
-    action: Pick<factory.action.authorize.invoice.IAction, 'id' | 'typeOf'>;
+    action: Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'typeOf'>;
+    /**
+     * 決済方法チケット
+     */
+    ticketToken?: string;
 }): factory.assetTransaction.pay.IStartParamsWithoutDetail & {
-    instrument: factory.action.trade.pay.IInstrument[];
+    instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
 };
 export declare function createMovieTicket(params: factory.action.trade.pay.IMovieTicket): factory.action.trade.pay.IMovieTicket;
 export declare function createAuthorizeResult(params: {

package/lib/chevre/service/payment/any/factory.js

@@ -49,6 +49,7 @@ function creatPublishPaymentUrlParams(params) {
 }
 function creatPayTransactionStartParams(params) {
     var _a, _b, _c, _d;
+    const { ticketToken } = params;
     let expires = moment(params.transaction.expires)
         .add(1, 'month')
         .toDate(); // 余裕を持って
@@ -66,9 +67,11 @@ function creatPayTransactionStartParams(params) {
         ? params.accountId
         : (typeof params.object.accountId === 'string') ? params.object.accountId : undefined;
     const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(createMovieTicket) : undefined;
+    const ticketAsInstrument = (typeof ticketToken === 'string') ? { ticketToken, typeOf: 'Ticket' } : undefined;
     const instrument = [
         { id: params.action.id, typeOf: params.action.typeOf },
-        { orderNumber, typeOf: factory.order.OrderType.Order }
+        { orderNumber, typeOf: factory.order.OrderType.Order },
+        ...(ticketAsInstrument !== undefined) ? [ticketAsInstrument] : [] // add ticketAsInstrument(2025-11-25~)
     ];
     return Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
             typeOf: params.transaction.seller.typeOf,

package/lib/chevre/service/payment/any.js

@@ -443,7 +443,7 @@ function authorize(params) {
         if (typeof fixTransactionNumberResult.id === 'string') {
             return { id: fixTransactionNumberResult.id };
         }
-        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, invoiceByTicketToken } = fixTransactionNumberResult;
+        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, invoiceByTicketToken, ticketToken } = fixTransactionNumberResult;
         // let transactionNumber: string | undefined;
         // let pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction | undefined;
         // let creditCard: factory.action.authorize.paymentMethod.any.ICreditCard | undefined = params.object.creditCard;
@@ -538,7 +538,8 @@ function authorize(params) {
                 // confirmationNumber required(2025-02-12~)
                 // orderNumber required(2025-02-14~)
                 order: { confirmationNumber, orderNumber },
-                action: { id: action.id, typeOf: action.typeOf }
+                action: { id: action.id, typeOf: action.typeOf },
+                ticketToken
             });
             payTransaction = yield PayTransactionService.start(startParams, Object.assign({ 
                 // useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet,

package/lib/chevre/service/payment/factory.js

@@ -15,11 +15,6 @@ function createPayOrderAction(params) {
         confirmationNumber: params.order.confirmationNumber,
         orderNumber: params.order.orderNumber
     };
-    // const instrument: factory.action.trade.pay.IInstrument = {
-    //     id: params.transaction.id,
-    //     transactionNumber: params.transaction.transactionNumber,
-    //     typeOf: params.transaction.typeOf
-    // };
     const instrument = [
         {
             id: params.transaction.id,

package/lib/chevre/service/payment/movieTicket/authorize.js

@@ -48,11 +48,6 @@ function authorize(params, transaction, paymentServiceId, options) {
                     }, typeOf: paymentMethodType }, (typeof accountId === 'string') ? { accountId } : undefined),
                 movieTickets: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets
             };
-            // const instrument: factory.action.trade.pay.IInstrument = {
-            //     id: transaction.id,
-            //     transactionNumber: transaction.transactionNumber,
-            //     typeOf: transaction.typeOf
-            // };
             const instrument = [
                 {
                     id: transaction.id,

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": "5.3.0-alpha.4",
+    "@chevre/factory": "5.3.0-alpha.5",
     "@cinerino/sdk": "12.9.0-alpha.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.1.0-alpha.20"
+  "version": "23.1.0-alpha.21"
 }