@cinerino/sdk 5.14.1 → 5.15.0-alpha.1

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

@@ -108,8 +108,7 @@ async function main() {
             // additionalProperty
             amount: 10,
             issuedThrough: { id: '' },
-            paymentMethod: 'Cash',
-            typeOf: client.factory.action.authorize.paymentMethod.any.ResultType.Payment
+            paymentMethod: 'Cash'
 
         },
         purpose: { id: transaction.id, typeOf: client.factory.transactionType.PlaceOrder }

package/example/src/transaction/processPlaceOrderByAnonymousCreditCardAndMembership.ts

@@ -140,7 +140,6 @@ async function main() {
     console.log('authorizing credit card payment...');
     let creditCardPaymentAuth = await paymentService.authorizeCreditCard({
         object: {
-            typeOf: client.factory.action.authorize.paymentMethod.any.ResultType.Payment,
             amount: amount,
             paymentMethod: 'CreditCard',
             method: '1',
@@ -164,7 +163,6 @@ async function main() {
     console.log('authorizing credit card payment...');
     creditCardPaymentAuth = await paymentService.authorizeCreditCard({
         object: {
-            typeOf: client.factory.action.authorize.paymentMethod.any.ResultType.Payment,
             amount: amount,
             paymentMethod: 'CreditCard',
             method: '1',

package/example/src/transaction/processPlaceOrderByAnonymousCreditCardAndMyMembership.ts

@@ -164,7 +164,6 @@ async function main() {
     console.log('authorizing credit card payment...');
     let creditCardPaymentAuth = await paymentService.authorizeCreditCard({
         object: {
-            typeOf: client.factory.action.authorize.paymentMethod.any.ResultType.Payment,
             amount: amount,
             paymentMethod: 'CreditCard',
             method: '1',
@@ -188,7 +187,6 @@ async function main() {
     console.log('authorizing credit card payment...');
     creditCardPaymentAuth = await paymentService.authorizeCreditCard({
         object: {
-            typeOf: client.factory.action.authorize.paymentMethod.any.ResultType.Payment,
             amount: amount,
             paymentMethod: 'CreditCard',
             method: '1',

package/example/src/transaction/processPlaceOrderByCash.ts

@@ -272,7 +272,6 @@ async function main() {
     console.log('authorizing any payment...');
     const anyPaymentAuth = await paymentService.authorizeAnyPayment({
         object: {
-            typeOf: client.factory.action.authorize.paymentMethod.any.ResultType.Payment,
             paymentMethod: 'Cash',
             amount: amount,
             additionalProperty: [{ name: 'useCoin', value: '0' }],

package/example/src/transaction/processPlaceOrderByCreditCard3DS.ts

@@ -119,7 +119,6 @@ async function main() {
     // 決済URL発行
     const { paymentMethodId, paymentUrl } = await paymentService.publishCreditCardPaymentUrl({
         object: {
-            typeOf: client.factory.action.authorize.paymentMethod.any.ResultType.Payment,
             amount,
             paymentMethod: paymentMethodType,
             method: '1',
@@ -145,7 +144,6 @@ async function main() {
                 console.log('authorizing credit card payment...');
                 const creditCardPaymentAuth = await paymentService.authorizeCreditCard({
                     object: {
-                        typeOf: client.factory.action.authorize.paymentMethod.any.ResultType.Payment,
                         amount,
                         paymentMethod: paymentMethodType,
                         paymentMethodId, // URL発行時のpaymentMethodIdを指定

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

@@ -18,7 +18,7 @@ export declare class EventService extends Service {
     /**
      * イベント集計検索
      */
-    searchAggregations(params: Omit<factory.event.ISearchConditions<factory.eventType.ScreeningEvent>, 'project' | 'organizer'> & {
+    searchAggregations(params: Pick<factory.event.ISearchConditions<factory.eventType.ScreeningEvent>, 'page' | 'limit' | 'sort' | 'typeOf' | 'id' | 'startFrom' | 'startThrough'> & {
         $projection?: {
             aggregateEntranceGate?: 1;
             aggregateOffer?: 1;

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

@@ -0,0 +1,59 @@
+import * as factory from '../factory';
+import { Service } from '../service';
+export interface ISortOrder {
+    'reservationFor.startDate'?: factory.sortType;
+}
+export interface ISearchConditions {
+    limit?: number;
+    page?: number;
+    sort?: ISortOrder;
+    project?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    reservationFor?: {
+        id?: {
+            $eq?: string;
+            $in?: string[];
+        };
+        typeOf?: factory.eventType;
+        startFrom?: Date;
+        startThrough?: Date;
+    };
+}
+export interface IProjectionSearchConditions {
+    $projection?: {
+        aggregateEntranceGate?: 1;
+        aggregateOffer?: 1;
+        aggregateReservation?: 1;
+    };
+}
+export interface IAggregateReservation {
+    project: {
+        id: string;
+        typeOf: factory.organizationType.Project;
+    };
+    typeOf: 'AggregateReservation';
+    reservationFor: {
+        id: string;
+        typeOf: factory.eventType;
+        startDate: Date;
+    };
+    aggregateEntranceGate?: factory.event.screeningEvent.IAggregateEntranceGate;
+    aggregateReservation?: factory.event.screeningEvent.IAggregateReservation;
+    aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
+}
+declare type ISearchWithReservationForIdResult = Pick<IAggregateReservation, 'aggregateEntranceGate' | 'aggregateOffer' | 'aggregateReservation'> & {
+    /**
+     * イベントID
+     */
+    id: string;
+};
+/**
+ * 予約集計サービス
+ */
+export declare class AggregateReservationService extends Service {
+    search(params: Omit<ISearchConditions, 'project'> & IProjectionSearchConditions): Promise<ISearchWithReservationForIdResult[]>;
+}
+export {};

package/lib/abstract/chevreAdmin/aggregateReservation.js

@@ -0,0 +1,83 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AggregateReservationService = void 0;
+var http_status_1 = require("http-status");
+var service_1 = require("../service");
+/**
+ * 予約集計サービス
+ */
+var AggregateReservationService = /** @class */ (function (_super) {
+    __extends(AggregateReservationService, _super);
+    function AggregateReservationService() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    AggregateReservationService.prototype.search = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.fetch({
+                        uri: '/aggregateReservations',
+                        method: 'GET',
+                        qs: params,
+                        expectedStatusCodes: [http_status_1.OK]
+                    })
+                        .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, response.json()];
+                    }); }); })];
+            });
+        });
+    };
+    return AggregateReservationService;
+}(service_1.Service));
+exports.AggregateReservationService = AggregateReservationService;

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

@@ -1,2 +1,2 @@
 import * as factory from '../../factory';
-export declare type ISearchedEvent<T extends factory.eventType> = T extends factory.eventType.Event ? Omit<factory.event.IEvent<factory.eventType.Event>, 'workPerformed'> : T extends factory.eventType.ScreeningEvent ? Omit<factory.event.IEvent<factory.eventType.ScreeningEvent>, 'workPerformed'> : T extends factory.eventType.ScreeningEventSeries ? factory.event.IEvent<factory.eventType.ScreeningEventSeries> : never;
+export declare type ISearchedEvent<T extends factory.eventType> = T extends factory.eventType.Event ? Omit<factory.event.IEvent<factory.eventType.Event>, 'workPerformed' | 'aggregateEntranceGate' | 'aggregateOffer'> : T extends factory.eventType.ScreeningEvent ? Omit<factory.event.IEvent<factory.eventType.ScreeningEvent>, 'workPerformed' | 'aggregateEntranceGate' | 'aggregateOffer'> : T extends factory.eventType.ScreeningEventSeries ? factory.event.IEvent<factory.eventType.ScreeningEventSeries> : never;

package/lib/abstract/chevreAdmin.d.ts

@@ -6,6 +6,7 @@ import type { AccountTransactionService } from './chevreAdmin/accountTransaction
 import type { ActionService } from './chevreAdmin/action';
 import type { AdditionalPropertyService } from './chevreAdmin/additionalProperty';
 import type { AggregateOfferService } from './chevreAdmin/aggregateOffer';
+import type { AggregateReservationService } from './chevreAdmin/aggregateReservation';
 import type { AggregationService } from './chevreAdmin/aggregation';
 import type { AssetTransactionService } from './chevreAdmin/assetTransaction';
 import type { CancelReservationAssetTransactionService } from './chevreAdmin/assetTransaction/cancelReservation';
@@ -103,6 +104,13 @@ export declare namespace service {
     namespace AggregateOffer {
         let svc: typeof AggregateOfferService | undefined;
     }
+    /**
+     * 予約集計サービス
+     */
+    type AggregateReservation = AggregateReservationService;
+    namespace AggregateReservation {
+        let svc: typeof AggregateReservationService | undefined;
+    }
     /**
      * 集計サービス
      */
@@ -450,6 +458,7 @@ export declare class ChevreAdmin {
     createActionInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<ActionService>;
     createAdditionalPropertyInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<AdditionalPropertyService>;
     createAggregateOfferInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<AggregateOfferService>;
+    createAggregateReservationInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<AggregateReservationService>;
     createAggregationInstance(): Promise<AggregationService>;
     createAuthorizationInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<AuthorizationService>;
     createCommentInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<CommentService>;

package/lib/abstract/chevreAdmin.js

@@ -71,6 +71,9 @@ var service;
     var AggregateOffer;
     (function (AggregateOffer) {
     })(AggregateOffer = service.AggregateOffer || (service.AggregateOffer = {}));
+    var AggregateReservation;
+    (function (AggregateReservation) {
+    })(AggregateReservation = service.AggregateReservation || (service.AggregateReservation = {}));
     var Aggregation;
     (function (Aggregation) {
     })(Aggregation = service.Aggregation || (service.Aggregation = {}));
@@ -352,6 +355,23 @@ var ChevreAdmin = /** @class */ (function () {
             });
         });
     };
+    ChevreAdmin.prototype.createAggregateReservationInstance = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!(service.AggregateReservation.svc === undefined)) return [3 /*break*/, 2];
+                        _a = service.AggregateReservation;
+                        return [4 /*yield*/, Promise.resolve().then(function () { return require('./chevreAdmin/aggregateReservation'); })];
+                    case 1:
+                        _a.svc = (_b.sent()).AggregateReservationService;
+                        _b.label = 2;
+                    case 2: return [2 /*return*/, new service.AggregateReservation.svc(__assign(__assign({}, this.options), params))];
+                }
+            });
+        });
+    };
     ChevreAdmin.prototype.createAggregationInstance = function () {
         return __awaiter(this, void 0, void 0, function () {
             var _a;

package/lib/abstract/chevreTxn/payment/factory.d.ts

@@ -1,9 +1,5 @@
 import * as factory from '../../factory';
 export import IPurpose = factory.action.authorize.paymentMethod.any.IPurpose;
-export interface IPublishPaymentUrlResult {
-    paymentMethodId: string;
-    paymentUrl: string;
-}
 /**
  * 決済承認レスポンス
  * 最適化(2023-02-02~)
@@ -17,7 +13,14 @@ export interface IAuthorizeResult {
 export interface ICheckMovieTicketResult {
     purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
 }
-export declare type IAuthorizeAnyPaymentObject = Pick<factory.action.authorize.paymentMethod.any.IObject, 'additionalProperty' | 'amount' | 'issuedThrough' | 'name' | 'paymentMethod' | 'typeOf'>;
-export declare type IAuthorizeCreditCardObject = Pick<factory.action.authorize.paymentMethod.any.IObject, 'additionalProperty' | 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'name' | 'paymentMethod' | 'paymentMethodId' | 'typeOf'>;
-export declare type IAuthorizeMovieTicketObject = Pick<factory.action.authorize.paymentMethod.any.IObject, 'additionalProperty' | 'amount' | 'issuedThrough' | 'movieTickets' | 'name' | 'paymentMethod' | 'typeOf'>;
-export declare type IPublishPaymentUrlObject = Pick<factory.action.authorize.paymentMethod.any.IObject, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'typeOf'>;
+export declare type IAuthorizeAnyPaymentObject = Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod' | 'name' | 'additionalProperty'>;
+export declare type IAuthorizeCreditCardObject = Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod' | 'creditCard' | 'method' | 'paymentMethodId' | 'name' | 'additionalProperty'>;
+export declare type IAuthorizeMovieTicketObject = Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'issuedThrough' | 'paymentMethod' | 'movieTickets' | 'name' | 'additionalProperty'>;
+export declare type IAuthorizePaymentCardObject = Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod' | 'fromLocation' | 'name' | 'additionalProperty'> & {
+    description?: string;
+};
+export declare type IPublishPaymentUrlObject = Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'paymentMethod' | 'method'>;
+export interface IPublishPaymentUrlResult {
+    paymentMethodId: string;
+    paymentUrl: string;
+}

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

@@ -1,6 +1,6 @@
 import * as factory from '../factory';
 import { Service } from '../service';
-import { IAuthorizeAnyPaymentObject, IAuthorizeCreditCardObject, IAuthorizeMovieTicketObject, IAuthorizeResult, ICheckMovieTicketResult, IPublishPaymentUrlObject, IPublishPaymentUrlResult, IPurpose } from './payment/factory';
+import { IAuthorizeAnyPaymentObject, IAuthorizeCreditCardObject, IAuthorizeMovieTicketObject, IAuthorizePaymentCardObject, IAuthorizeResult, ICheckMovieTicketResult, IPublishPaymentUrlObject, IPublishPaymentUrlResult, IPurpose } from './payment/factory';
 /**
  * 決済サービス
  */
@@ -38,7 +38,7 @@ export declare class PaymentService extends Service {
      * ペイメントカード決済承認
      */
     authorizePaymentCard(params: {
-        object: factory.action.authorize.paymentMethod.any.IObject;
+        object: IAuthorizePaymentCardObject;
         purpose: IPurpose;
     }): Promise<IAuthorizeResult>;
     /**

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

@@ -111,7 +111,7 @@ export declare class EventService extends Service {
     /**
      * イベント集計検索
      */
-    searchAggregations(params: Omit<factory.event.ISearchConditions<factory.eventType.ScreeningEvent>, 'project' | 'organizer'> & {
+    searchAggregations(params: Pick<factory.event.ISearchConditions<factory.eventType.ScreeningEvent>, 'page' | 'limit' | 'sort' | 'typeOf' | 'id' | 'startFrom' | 'startThrough'> & {
         $projection?: {
             aggregateEntranceGate?: 1;
             aggregateOffer?: 1;

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

@@ -1,4 +1,4 @@
-import { IAuthorizeAnyPaymentObject, IAuthorizeCreditCardObject, IAuthorizeMovieTicketObject, IAuthorizeResult, ICheckMovieTicketResult, IPublishPaymentUrlObject, IPublishPaymentUrlResult, IPurpose } from '../chevreTxn/payment/factory';
+import { IAuthorizeAnyPaymentObject, IAuthorizeCreditCardObject, IAuthorizeMovieTicketObject, IAuthorizePaymentCardObject, IAuthorizeResult, ICheckMovieTicketResult, IPublishPaymentUrlObject, IPublishPaymentUrlResult, IPurpose } from '../chevreTxn/payment/factory';
 import * as factory from '../factory';
 import { Service } from '../service';
 /**
@@ -30,7 +30,7 @@ export declare class PaymentService extends Service {
      * ペイメントカード決済承認
      */
     authorizePaymentCard(params: {
-        object: factory.action.authorize.paymentMethod.any.IObject;
+        object: IAuthorizePaymentCardObject;
         purpose: IPurpose;
     }): Promise<IAuthorizeResult>;
     /**