@cinerino/sdk 12.7.0-alpha.0 → 12.7.0-alpha.2

package/example/src/chevre/admin/adminCreateEventIfNotExistByIdentifier.ts

@@ -117,22 +117,6 @@ async function main() {
                     },
                     itemOffered: {
                         id: EVENT_SERVICE_ID
-                    },
-                    seller: {
-                        makesOffer: [
-                            // {
-                            //     typeOf: client.factory.offerType.Offer,
-                            //     availableAtOrFrom: { id: AVAILABLE_AT_OR_FROM_ID }, // <-販売アプリケーションIDを指定する
-                            //     availabilityStarts: moment(`${today}T00:00:00+09:00`)
-                            //         .toDate(),
-                            //     availabilityEnds: moment(`${today}T14:00:00Z`)
-                            //         .toDate(),
-                            //     validFrom: moment(`${today}T00:00:00+09:00`)
-                            //         .toDate(),
-                            //     validThrough: moment(`${today}T14:00:00Z`)
-                            //         .toDate()
-                            // }
-                        ]
                     }
                 }
             }

package/example/src/cloud/admin/adminEventsByIdentifier.ts

@@ -115,19 +115,7 @@ async function main() {
                 ],
                 offers: {
                     eligibleQuantity: { maxValue: 6 },
-                    itemOffered: { id: EVENT_SERVICE_ID },
-                    seller: {
-                        makesOffer: [
-                            {
-                                typeOf: client.factory.offerType.Offer,
-                                availableAtOrFrom: { id: AVAILABLE_AT_OR_FROM_ID },
-                                availabilityStarts: validFrom,
-                                availabilityEnds: validThrough,
-                                validFrom,
-                                validThrough
-                            }
-                        ]
-                    }
+                    itemOffered: { id: EVENT_SERVICE_ID }
                 }
             }
         ],

package/example/src/cloud/transaction/processPlaceOrderByCreditCard3DS.ts

@@ -76,7 +76,8 @@ async function main() {
             .toDate(),
         inSessionThrough: moment()
             .add(1, 'week')
-            .toDate()
+            .toDate(),
+        eventStatuses: [client.factory.eventStatusType.EventScheduled]
     });
     console.log(searchScreeningEventsResult.data.length, 'events found');
 
@@ -119,7 +120,13 @@ async function main() {
         }
 
         // 出力メンバーシップ対応の場合チケット発行
+        // let ticketToken: string | undefined;
         const { ticketToken } = await paymentService.issueTicketThroughCreditCard({
+            // ticketedInvoice: {
+            //     issuedThrough: {
+            //         id: paymentServiceId
+            //     }
+            // },
             ticketedPermit: {
                 issuedThrough: {
                     id: paymentServiceId

package/lib/abstract/chevreAdmin/event.d.ts

@@ -9,11 +9,9 @@ export declare type ICreateParamsByIdentifier = Pick<factory.event.screeningEven
         itemOffered: Pick<factory.event.screeningEvent.IItemOffered, 'id'>;
     };
 };
-export declare type IUpdateParamsByIdentifier = Pick<factory.event.screeningEvent.IUpdateParams, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'maximumPhysicalAttendeeCapacity' | 'offers' | 'startDate'> & {
+export declare type IUpdateParamsByIdentifier = Pick<factory.event.screeningEvent.IUpdateByIdParams, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'maximumPhysicalAttendeeCapacity' | 'startDate'> & {
     identifier: string;
-    offers: Pick<factory.event.screeningEvent.IOffers4create, 'eligibleQuantity' | 'seller' | 'unacceptedPaymentMethod'> & {
-        itemOffered: Pick<factory.event.screeningEvent.IItemOffered, 'id'>;
-    };
+    offers: Pick<factory.event.screeningEvent.IOffer4update, 'eligibleQuantity' | 'unacceptedPaymentMethod' | 'itemOffered' | 'seller'>;
     location?: never;
     superEvent?: never;
 };

package/lib/abstract/chevreConsole/event.d.ts

@@ -5,13 +5,6 @@ declare type IKeyOfProjection = keyof factory.event.screeningEvent.IEvent | '_id
 declare type IProjection = {
     [key in IKeyOfProjection]?: 0;
 };
-declare type IUnset = {
-    [key in keyof factory.event.screeningEvent.IEvent]?: 1;
-};
-declare type IUpdateEventByIdAttributes = Pick<factory.event.screeningEvent.IUpdateParams, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'maximumPhysicalAttendeeCapacity' | 'offers' | 'startDate'> & {
-    offers: Pick<factory.event.screeningEvent.IOffers4create, 'eligibleQuantity' | 'identifier' | 'itemOffered' | 'seller' | 'unacceptedPaymentMethod'> & {};
-    $unset?: IUnset;
-};
 /**
  * イベントサービス
  */
@@ -43,7 +36,7 @@ export declare class EventService extends Service {
      */
     updateEventById(params: {
         id: string;
-        attributes: IUpdateEventByIdAttributes;
+        attributes: factory.event.screeningEvent.IUpdateByIdParams;
         options: {
             disableOverwriteMakesOffer: boolean;
         };

package/lib/abstract/chevrePay/payment.d.ts

@@ -185,6 +185,7 @@ export declare class PaymentService extends Service {
         purpose: IPurpose;
     }): Promise<ITicket>;
     issueTicketThroughCreditCard(params: {
+        ticketedInvoice?: never;
         ticketedPermit: {
             issuedThrough: {
                 /**
@@ -194,6 +195,17 @@ export declare class PaymentService extends Service {
             };
         };
         purpose: IPurpose;
+    } | {
+        ticketedInvoice: {
+            issuedThrough: {
+                /**
+                 * 発行決済サービスID
+                 */
+                id: string;
+            };
+        };
+        ticketedPermit?: never;
+        purpose: IPurpose;
     }): Promise<ITicket>;
     issueTicketThroughMovieTicket(params: {
         ticketedInvoice: {

package/lib/abstract/chevrePay/payment.js

@@ -445,17 +445,21 @@ var PaymentService = /** @class */ (function (_super) {
     };
     PaymentService.prototype.issueTicketThroughCreditCard = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var purpose, ticketedPermit;
+            var purpose, ticketedPermit, ticketedInvoice, serviceOutputType;
             var _this = this;
             return __generator(this, function (_a) {
-                purpose = params.purpose, ticketedPermit = params.ticketedPermit;
+                purpose = params.purpose, ticketedPermit = params.ticketedPermit, ticketedInvoice = params.ticketedInvoice;
+                serviceOutputType = (typeof (ticketedPermit === null || ticketedPermit === void 0 ? void 0 : ticketedPermit.issuedThrough.id) === 'string')
+                    ? factory.permit.PermitType.Permit
+                    : 'Invoice';
                 return [2 /*return*/, this.fetch({
                         uri: "/payment/" + factory.service.paymentService.PaymentServiceType.CreditCard + "/tickets",
                         method: 'POST',
                         expectedStatusCodes: [http_status_1.CREATED],
-                        body: { purpose: purpose, ticketedPermit: ticketedPermit },
+                        body: { purpose: purpose, ticketedPermit: ticketedPermit, ticketedInvoice: ticketedInvoice },
                         qs: {
-                            purpose: { id: purpose.id }
+                            purpose: { id: purpose.id },
+                            serviceOutputType: serviceOutputType // log目的でクエリ追加(2025-11-09~)
                         }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {

package/lib/abstract/cloud/pay/payment.d.ts

@@ -227,6 +227,7 @@ export declare class PaymentService extends Service {
      * CreditCardIF決済によるチケット発行
      */
     issueTicketThroughCreditCard(params: {
+        ticketedInvoice?: never;
         ticketedPermit: {
             issuedThrough: {
                 /**
@@ -236,6 +237,18 @@ export declare class PaymentService extends Service {
             };
         };
         purpose: IPurpose;
+    } | {
+        ticketedInvoice: {
+            issuedThrough: {
+                /**
+                 * 発行決済サービスID
+                 */
+                id: string;
+            };
+        };
+        ticketedPermit?: never;
+        purpose: IPurpose;
     }): Promise<ITicket>;
     private issueTicketThroughMovieTicketUntilSuccess;
+    private issueTicketThroughCreditCardIfNotExists;
 }

package/lib/abstract/cloud/pay/payment.js

@@ -83,7 +83,8 @@ var http_status_1 = require("http-status");
 var factory = require("../../factory");
 var index_1 = require("../../index");
 var service_1 = require("../../service");
-var ISSUE_TICKET_INTERVAL_MS = 5000;
+var ISSUE_TICKET_AUTHORIZE_CREDIT_CARD_INTERVAL_MS = 1000;
+var RETRY_ISSUE_TICKET_INTERVAL_MS = 5000;
 function wait(waitInMilliseconds) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -134,7 +135,7 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.authorizeCreditCardAsync = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService;
+            var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService, ticketToken;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -153,7 +154,13 @@ var PaymentService = /** @class */ (function (_super) {
                             })];
                     case 2:
                         paymentService = _b.sent();
-                        return [2 /*return*/, paymentService.authorizeCreditCard({ object: object, purpose: purpose }, { async: true })];
+                        return [4 /*yield*/, this.issueTicketThroughCreditCardIfNotExists({ object: object, purpose: purpose }, { checkPaymentMethodId: true })];
+                    case 3:
+                        ticketToken = (_b.sent()).ticketToken;
+                        return [2 /*return*/, paymentService.authorizeCreditCard({
+                                object: __assign(__assign({}, object), { ticketToken: ticketToken }),
+                                purpose: purpose
+                            }, { async: true })];
                 }
             });
         });
@@ -199,10 +206,11 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.publishCreditCardPaymentUrlAsync = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService;
+            var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService, ticketToken;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
+                        object = params.object, purpose = params.purpose;
                         _a = this.options, auth = _a.auth, endpoint = _a.endpoint, project = _a.project, seller = _a.seller, disableAutoRetry = _a.disableAutoRetry, retryableStatusCodes = _a.retryableStatusCodes;
                         return [4 /*yield*/, index_1.loadChevrePay({ auth: auth, endpoint: endpoint, disableAutoRetry: disableAutoRetry })];
                     case 1:
@@ -218,7 +226,13 @@ var PaymentService = /** @class */ (function (_super) {
                             })];
                     case 2:
                         paymentService = _b.sent();
-                        return [2 /*return*/, paymentService.publishCreditCardPaymentUrlAsync(params)];
+                        return [4 /*yield*/, this.issueTicketThroughCreditCardIfNotExists({ object: object, purpose: purpose }, { checkPaymentMethodId: false })];
+                    case 3:
+                        ticketToken = (_b.sent()).ticketToken;
+                        return [2 /*return*/, paymentService.publishCreditCardPaymentUrlAsync({
+                                object: __assign(__assign({}, object), { ticketToken: ticketToken }),
+                                purpose: purpose
+                            })];
                 }
             });
         });
@@ -622,7 +636,7 @@ var PaymentService = /** @class */ (function (_super) {
                         return [3 /*break*/, 7];
                     case 7: 
                     // n秒待機
-                    return [4 /*yield*/, wait(ISSUE_TICKET_INTERVAL_MS)];
+                    return [4 /*yield*/, wait(RETRY_ISSUE_TICKET_INTERVAL_MS)];
                     case 8:
                         // n秒待機
                         _c.sent();
@@ -638,6 +652,49 @@ var PaymentService = /** @class */ (function (_super) {
             });
         });
     };
+    PaymentService.prototype.issueTicketThroughCreditCardIfNotExists = function (params, options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var object, purpose, checkPaymentMethodId, issueForcibly, ticketToken, paymentMethodId, automaticallyIssuedTicket;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        object = params.object, purpose = params.purpose;
+                        checkPaymentMethodId = options.checkPaymentMethodId;
+                        issueForcibly = false;
+                        ticketToken = object.ticketToken;
+                        paymentMethodId = object.paymentMethodId;
+                        if (checkPaymentMethodId) {
+                            // 承認時は、ticketTokenもpaymentMethodIdも指定がない場合に、自動発行
+                            if ((typeof ticketToken !== 'string' || ticketToken === '')
+                                && (typeof paymentMethodId !== 'string' || paymentMethodId === '')) {
+                                issueForcibly = true;
+                            }
+                        }
+                        else {
+                            // 決済URL発行時は、ticketTokenの指定がない場合に、自動発行
+                            if (typeof ticketToken !== 'string' || ticketToken === '') {
+                                issueForcibly = true;
+                            }
+                        }
+                        if (!issueForcibly) {
+                            return [2 /*return*/, { ticketToken: ticketToken }];
+                        }
+                        return [4 /*yield*/, this.issueTicketThroughCreditCard({
+                                ticketedInvoice: { issuedThrough: { id: object.issuedThrough.id } },
+                                purpose: purpose
+                            })];
+                    case 1:
+                        automaticallyIssuedTicket = _a.sent();
+                        // n秒待機
+                        return [4 /*yield*/, wait(ISSUE_TICKET_AUTHORIZE_CREDIT_CARD_INTERVAL_MS)];
+                    case 2:
+                        // n秒待機
+                        _a.sent();
+                        return [2 /*return*/, automaticallyIssuedTicket];
+                }
+            });
+        });
+    };
     return PaymentService;
 }(service_1.Service));
 exports.PaymentService = PaymentService;

package/lib/bundle.js

@@ -18427,17 +18427,21 @@ var PaymentService = /** @class */ (function (_super) {
     };
     PaymentService.prototype.issueTicketThroughCreditCard = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var purpose, ticketedPermit;
+            var purpose, ticketedPermit, ticketedInvoice, serviceOutputType;
             var _this = this;
             return __generator(this, function (_a) {
-                purpose = params.purpose, ticketedPermit = params.ticketedPermit;
+                purpose = params.purpose, ticketedPermit = params.ticketedPermit, ticketedInvoice = params.ticketedInvoice;
+                serviceOutputType = (typeof (ticketedPermit === null || ticketedPermit === void 0 ? void 0 : ticketedPermit.issuedThrough.id) === 'string')
+                    ? factory.permit.PermitType.Permit
+                    : 'Invoice';
                 return [2 /*return*/, this.fetch({
                         uri: "/payment/" + factory.service.paymentService.PaymentServiceType.CreditCard + "/tickets",
                         method: 'POST',
                         expectedStatusCodes: [http_status_1.CREATED],
-                        body: { purpose: purpose, ticketedPermit: ticketedPermit },
+                        body: { purpose: purpose, ticketedPermit: ticketedPermit, ticketedInvoice: ticketedInvoice },
                         qs: {
-                            purpose: { id: purpose.id }
+                            purpose: { id: purpose.id },
+                            serviceOutputType: serviceOutputType // log目的でクエリ追加(2025-11-09~)
                         }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
@@ -24065,7 +24069,8 @@ var http_status_1 = require("http-status");
 var factory = require("../../factory");
 var index_1 = require("../../index");
 var service_1 = require("../../service");
-var ISSUE_TICKET_INTERVAL_MS = 5000;
+var ISSUE_TICKET_AUTHORIZE_CREDIT_CARD_INTERVAL_MS = 1000;
+var RETRY_ISSUE_TICKET_INTERVAL_MS = 5000;
 function wait(waitInMilliseconds) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -24116,7 +24121,7 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.authorizeCreditCardAsync = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService;
+            var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService, ticketToken;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -24135,7 +24140,13 @@ var PaymentService = /** @class */ (function (_super) {
                             })];
                     case 2:
                         paymentService = _b.sent();
-                        return [2 /*return*/, paymentService.authorizeCreditCard({ object: object, purpose: purpose }, { async: true })];
+                        return [4 /*yield*/, this.issueTicketThroughCreditCardIfNotExists({ object: object, purpose: purpose }, { checkPaymentMethodId: true })];
+                    case 3:
+                        ticketToken = (_b.sent()).ticketToken;
+                        return [2 /*return*/, paymentService.authorizeCreditCard({
+                                object: __assign(__assign({}, object), { ticketToken: ticketToken }),
+                                purpose: purpose
+                            }, { async: true })];
                 }
             });
         });
@@ -24181,10 +24192,11 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.publishCreditCardPaymentUrlAsync = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService;
+            var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService, ticketToken;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
+                        object = params.object, purpose = params.purpose;
                         _a = this.options, auth = _a.auth, endpoint = _a.endpoint, project = _a.project, seller = _a.seller, disableAutoRetry = _a.disableAutoRetry, retryableStatusCodes = _a.retryableStatusCodes;
                         return [4 /*yield*/, index_1.loadChevrePay({ auth: auth, endpoint: endpoint, disableAutoRetry: disableAutoRetry })];
                     case 1:
@@ -24200,7 +24212,13 @@ var PaymentService = /** @class */ (function (_super) {
                             })];
                     case 2:
                         paymentService = _b.sent();
-                        return [2 /*return*/, paymentService.publishCreditCardPaymentUrlAsync(params)];
+                        return [4 /*yield*/, this.issueTicketThroughCreditCardIfNotExists({ object: object, purpose: purpose }, { checkPaymentMethodId: false })];
+                    case 3:
+                        ticketToken = (_b.sent()).ticketToken;
+                        return [2 /*return*/, paymentService.publishCreditCardPaymentUrlAsync({
+                                object: __assign(__assign({}, object), { ticketToken: ticketToken }),
+                                purpose: purpose
+                            })];
                 }
             });
         });
@@ -24604,7 +24622,7 @@ var PaymentService = /** @class */ (function (_super) {
                         return [3 /*break*/, 7];
                     case 7: 
                     // n秒待機
-                    return [4 /*yield*/, wait(ISSUE_TICKET_INTERVAL_MS)];
+                    return [4 /*yield*/, wait(RETRY_ISSUE_TICKET_INTERVAL_MS)];
                     case 8:
                         // n秒待機
                         _c.sent();
@@ -24620,6 +24638,49 @@ var PaymentService = /** @class */ (function (_super) {
             });
         });
     };
+    PaymentService.prototype.issueTicketThroughCreditCardIfNotExists = function (params, options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var object, purpose, checkPaymentMethodId, issueForcibly, ticketToken, paymentMethodId, automaticallyIssuedTicket;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        object = params.object, purpose = params.purpose;
+                        checkPaymentMethodId = options.checkPaymentMethodId;
+                        issueForcibly = false;
+                        ticketToken = object.ticketToken;
+                        paymentMethodId = object.paymentMethodId;
+                        if (checkPaymentMethodId) {
+                            // 承認時は、ticketTokenもpaymentMethodIdも指定がない場合に、自動発行
+                            if ((typeof ticketToken !== 'string' || ticketToken === '')
+                                && (typeof paymentMethodId !== 'string' || paymentMethodId === '')) {
+                                issueForcibly = true;
+                            }
+                        }
+                        else {
+                            // 決済URL発行時は、ticketTokenの指定がない場合に、自動発行
+                            if (typeof ticketToken !== 'string' || ticketToken === '') {
+                                issueForcibly = true;
+                            }
+                        }
+                        if (!issueForcibly) {
+                            return [2 /*return*/, { ticketToken: ticketToken }];
+                        }
+                        return [4 /*yield*/, this.issueTicketThroughCreditCard({
+                                ticketedInvoice: { issuedThrough: { id: object.issuedThrough.id } },
+                                purpose: purpose
+                            })];
+                    case 1:
+                        automaticallyIssuedTicket = _a.sent();
+                        // n秒待機
+                        return [4 /*yield*/, wait(ISSUE_TICKET_AUTHORIZE_CREDIT_CARD_INTERVAL_MS)];
+                    case 2:
+                        // n秒待機
+                        _a.sent();
+                        return [2 /*return*/, automaticallyIssuedTicket];
+                }
+            });
+        });
+    };
     return PaymentService;
 }(service_1.Service));
 exports.PaymentService = PaymentService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cinerino/sdk",
-  "version": "12.7.0-alpha.0",
+  "version": "12.7.0-alpha.2",
   "description": "Cinerino SDK",
   "main": "./lib/index.js",
   "browser": {
@@ -93,7 +93,7 @@
     "watchify": "^3.11.1"
   },
   "dependencies": {
-    "@chevre/factory": "5.2.0-alpha.3",
+    "@chevre/factory": "5.2.0-alpha.4",
     "debug": "3.2.7",
     "http-status": "1.7.4",
     "idtoken-verifier": "2.0.3",