@chevre/domain 21.17.0-alpha.9 → 21.17.0

package/lib/chevre/repo/sellerPaymentAccepted.js

@@ -0,0 +1,132 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MongoRepository = void 0;
+const mongoose_1 = require("mongoose");
+const seller_1 = require("./mongoose/schemas/seller");
+const factory = require("../factory");
+const settings_1 = require("../settings");
+/**
+ * 販売者対応決済方法リポジトリ
+ */
+class MongoRepository {
+    constructor(connection) {
+        this.sellerModel = connection.model(seller_1.modelName, (0, seller_1.createSchema)());
+    }
+    search(params) {
+        var _a, _b, _c, _d, _e;
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = [];
+            const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+            if (typeof projectIdEq === 'string') {
+                matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
+            }
+            const sellerIdEq = (_d = (_c = params.seller) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            if (typeof sellerIdEq === 'string') {
+                matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(sellerIdEq) } } });
+            }
+            const codeValueEq = (_e = params.codeValue) === null || _e === void 0 ? void 0 : _e.$eq;
+            if (typeof codeValueEq === 'string') {
+                matchStages.push({ $match: { 'paymentAccepted.paymentMethodType': { $exists: true, $eq: codeValueEq } } });
+            }
+            const aggregate = this.sellerModel.aggregate([
+                {
+                    $unwind: {
+                        path: '$paymentAccepted'
+                    }
+                },
+                ...matchStages,
+                { $sort: { 'paymentAccepted.paymentMethodType': factory.sortType.Ascending } },
+                {
+                    $project: {
+                        _id: 0,
+                        codeValue: '$paymentAccepted.paymentMethodType',
+                        seller: { id: { $toString: '$_id' } }
+                    }
+                }
+            ]);
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                aggregate.limit(params.limit * page)
+                    .skip(params.limit * (page - 1));
+            }
+            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    create(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let doc = yield this.sellerModel.findOne({
+                'project.id': { $eq: params.project.id },
+                _id: { $eq: params.seller.id }
+            }, { _id: 1 })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.organizationType.Corporation);
+            }
+            const creatingPaymentAccepted = {
+                paymentMethodType: params.codeValue
+            };
+            doc = yield this.sellerModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                _id: { $eq: params.seller.id },
+                'paymentAccepted.paymentMethodType': { $ne: params.codeValue }
+            }, {
+                $push: { paymentAccepted: creatingPaymentAccepted }
+            }, {
+                projection: { _id: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.AlreadyInUse('paymentAccepted', ['paymentMethodType']);
+            }
+        });
+    }
+    deleteOne(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.sellerModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                _id: { $eq: params.seller.id },
+                'paymentAccepted.paymentMethodType': { $exists: true, $eq: params.codeValue }
+            }, {
+                $pull: { paymentAccepted: { paymentMethodType: params.codeValue } }
+            }, {
+                projection: { _id: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.organizationType.Corporation);
+            }
+        });
+    }
+    isAcceptedBySeller(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const aggregate = this.sellerModel.aggregate([
+                {
+                    $unwind: { path: '$paymentAccepted' }
+                },
+                { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(params.seller.id) } } },
+                { $match: { 'paymentAccepted.paymentMethodType': { $exists: true, $eq: params.codeValue } } },
+                {
+                    $project: {
+                        _id: 0,
+                        codeValue: '$paymentAccepted.paymentMethodType'
+                    }
+                }
+            ])
+                .limit(1)
+                .skip(0);
+            return (yield aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec()).length > 0;
+        });
+    }
+}
+exports.MongoRepository = MongoRepository;

package/lib/chevre/repository.d.ts

@@ -37,6 +37,7 @@ import type { RedisRepository as OfferRateLimitRepo } from './repo/rateLimit/off
 import type { MongoRepository as ReservationRepo } from './repo/reservation';
 import type { MongoRepository as RoleRepo } from './repo/role';
 import type { MongoRepository as SellerRepo } from './repo/seller';
+import type { MongoRepository as SellerPaymentAcceptedRepo } from './repo/sellerPaymentAccepted';
 import type { MongoRepository as ServiceOutputRepo } from './repo/serviceOutput';
 import type { RedisRepository as ServiceOutputIdentifierRepo } from './repo/serviceOutputIdentifier';
 import type { StockHolderRepository as StockHolderRepo } from './repo/stockHolder';
@@ -219,6 +220,10 @@ export type Seller = SellerRepo;
 export declare namespace Seller {
     function createInstance(...params: ConstructorParameters<typeof SellerRepo>): Promise<SellerRepo>;
 }
+export type SellerPaymentAccepted = SellerPaymentAcceptedRepo;
+export declare namespace SellerPaymentAccepted {
+    function createInstance(...params: ConstructorParameters<typeof SellerPaymentAcceptedRepo>): Promise<SellerPaymentAcceptedRepo>;
+}
 export type ServiceOutput = ServiceOutputRepo;
 export declare namespace ServiceOutput {
     function createInstance(...params: ConstructorParameters<typeof ServiceOutputRepo>): Promise<ServiceOutputRepo>;

package/lib/chevre/repository.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.place = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.place = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
 var Account;
 (function (Account) {
     let repo;
@@ -539,6 +539,19 @@ var Seller;
     }
     Seller.createInstance = createInstance;
 })(Seller = exports.Seller || (exports.Seller = {}));
+var SellerPaymentAccepted;
+(function (SellerPaymentAccepted) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/sellerPaymentAccepted'))).MongoRepository;
+            }
+            return new repo(...params);
+        });
+    }
+    SellerPaymentAccepted.createInstance = createInstance;
+})(SellerPaymentAccepted = exports.SellerPaymentAccepted || (exports.SellerPaymentAccepted = {}));
 var ServiceOutput;
 (function (ServiceOutput) {
     let repo;

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

@@ -1,8 +1,8 @@
 /**
  * ペイメントカード決済取引バリデーション
  */
-import type { MongoRepository as SellerRepo } from '../../../../repo/seller';
+import type { MongoRepository as PaymentAcceptedRepo } from '../../../../repo/sellerPaymentAccepted';
 import * as factory from '../../../../factory';
 export declare function validateAccount(params: factory.assetTransaction.pay.IStartParamsWithoutDetail): (repos: {
-    seller: SellerRepo;
+    paymentAccepted: PaymentAcceptedRepo;
 }) => Promise<void>;

package/lib/chevre/service/assetTransaction/pay/account/validation.js

@@ -13,7 +13,7 @@ exports.validateAccount = void 0;
 const factory = require("../../../../factory");
 function validateAccount(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         // 引き出し口座の存在を確認する
         const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
@@ -28,31 +28,27 @@ function validateAccount(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const sellers = yield repos.seller.search({
-            limit: 1,
-            page: 1,
-            id: { $eq: sellerId }
-        }, ['paymentAccepted'], []);
-        const seller = sellers.shift();
-        if (seller === undefined) {
-            throw new factory.errors.NotFound(factory.organizationType.Corporation);
-        }
-        const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
+        // const sellers = <Pick<factory.seller.ISeller, 'paymentAccepted'>[]>await repos.seller.search(
+        //     {
+        //         limit: 1,
+        //         page: 1,
+        //         id: { $eq: sellerId }
+        //     },
+        //     ['paymentAccepted'],
+        //     []
+        // );
+        // const seller = sellers.shift();
+        // if (seller === undefined) {
+        //     throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        // }
+        // const paymentAccepted = seller.paymentAccepted?.some((a) => a.paymentMethodType === paymentMethodType);
+        const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
+            seller: { id: sellerId },
+            codeValue: paymentMethodType
+        });
         if (paymentAccepted !== true) {
-            throw new factory.errors.Argument('recipient', `payment not accepted`);
+            throw new factory.errors.Argument('recipient', `payment not accepted [${paymentMethodType}]`);
         }
-        // ↓Pecorino側で口座存在確認、口座ステータス検証を実行しているので、必要なし
-        // const accounts = await repos.account.search({
-        //     limit: 1,
-        //     page: 1,
-        //     project: { id: { $eq: params.project.id } },
-        //     accountNumber: { $eq: accountNumber },
-        //     statuses: [factory.accountStatusType.Opened]
-        // });
-        // const account = accounts.shift();
-        // if (account === undefined) {
-        //     throw new factory.errors.NotFound('Account', `Account '${accountNumber}' not found`);
-        // }
     });
 }
 exports.validateAccount = validateAccount;

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

@@ -12,18 +12,18 @@ import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/p
 import type { CognitoRepository as PersonRepo } from '../../repo/person';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
-import type { MongoRepository as SellerRepo } from '../../repo/seller';
+import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import * as MovieTicketPayment from '../payment/movieTicket';
 export interface IStartOperationRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     event: EventRepo;
+    paymentAccepted: PaymentAcceptedRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     product: ProductRepo;
     project: ProjectRepo;
-    seller: SellerRepo;
     assetTransaction: AssetTransactionRepo;
     task: TaskRepo;
 }
@@ -34,7 +34,6 @@ export interface ICancelRepos {
     assetTransaction: AssetTransactionRepo;
     product: ProductRepo;
     project: ProjectRepo;
-    seller: SellerRepo;
     task: TaskRepo;
 }
 export type ICancelOperation<T> = (repos: ICancelRepos) => Promise<T>;
@@ -46,7 +45,6 @@ export interface IConfirmRepos {
     order: OrderRepo;
     product: ProductRepo;
     project: ProjectRepo;
-    seller: SellerRepo;
     task: TaskRepo;
 }
 export type IConfirmOperation<T> = (repos: IConfirmRepos) => Promise<T>;
@@ -57,24 +55,24 @@ export type IExportTasksOperation<T> = (repos: {
 export type ICheckOperation<T> = (repos: {
     action: ActionRepo;
     event: EventRepo;
+    paymentAccepted: PaymentAcceptedRepo;
     product: ProductRepo;
     project: ProjectRepo;
-    seller: SellerRepo;
 }) => Promise<T>;
 export type IPublishPaymentUrlOperation<T> = (repos: {
+    paymentAccepted: PaymentAcceptedRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     product: ProductRepo;
     project: ProjectRepo;
-    seller: SellerRepo;
 }) => Promise<T>;
 export type IInvalidatePaymentUrlOperation<T> = (repos: {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    paymentAccepted: PaymentAcceptedRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
-    seller: SellerRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<T>;
@@ -134,8 +132,8 @@ export declare function exportTasksById(params: {
 export declare function searchGMOTrade(params: {
     transactionNumber: string;
 }): (repos: {
+    paymentAccepted: PaymentAcceptedRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
-    seller: SellerRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<GMO.factory.credit.ISearchTradeResult>;

package/lib/chevre/service/assetTransaction/pay.js

@@ -203,20 +203,24 @@ function fixPaymentService(params) {
 }
 function validateSeller(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b;
         const sellerId = (_a = params.recipient) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const sellers = yield repos.seller.search({
-            limit: 1,
-            page: 1,
-            id: { $eq: sellerId }
-        }, ['paymentAccepted'], []);
-        const seller = sellers.shift();
-        if (seller === undefined) {
-            throw new factory.errors.NotFound(factory.organizationType.Corporation);
-        }
+        // const sellers = <Pick<factory.seller.ISeller, 'paymentAccepted'>[]>await repos.seller.search(
+        //     {
+        //         limit: 1,
+        //         page: 1,
+        //         id: { $eq: sellerId }
+        //     },
+        //     ['paymentAccepted'],
+        //     []
+        // );
+        // const seller = sellers.shift();
+        // if (seller === undefined) {
+        //     throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        // }
         const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
@@ -225,17 +229,25 @@ function validateSeller(params) {
         if (params.object.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
             if (paymentMethodType.length > 0) {
                 // 販売者の対応決済方法かどうか確認
-                const paymentAccepted = (_c = seller.paymentAccepted) === null || _c === void 0 ? void 0 : _c.some((a) => a.paymentMethodType === paymentMethodType);
+                // const paymentAccepted = seller.paymentAccepted?.some((a) => a.paymentMethodType === paymentMethodType);
+                const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
+                    seller: { id: sellerId },
+                    codeValue: paymentMethodType
+                });
                 if (paymentAccepted !== true) {
-                    throw new factory.errors.Argument('object.paymentMethod.identifier', `payment not accepted`);
+                    throw new factory.errors.Argument('object.paymentMethod.identifier', `payment not accepted [${paymentMethodType}]`);
                 }
             }
         }
         else {
             // 販売者の対応決済方法かどうか確認
-            const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
+            // const paymentAccepted = seller.paymentAccepted?.some((a) => a.paymentMethodType === paymentMethodType);
+            const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
+                seller: { id: sellerId },
+                codeValue: paymentMethodType
+            });
             if (paymentAccepted !== true) {
-                throw new factory.errors.Argument('object.paymentMethod.identifier', `payment not accepted`);
+                throw new factory.errors.Argument('object.paymentMethod.identifier', `payment not accepted [${paymentMethodType}]`);
             }
         }
     });

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -35,7 +35,7 @@ interface IAuthorizeRepos {
     transactionNumber: TransactionNumberRepo;
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
-type IAuthorizeOfferAction = factory.action.authorize.offer.seatReservation.IAction<factory.service.webAPI.Identifier>;
+type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
 /**
  * イベントオファー承認
  */
@@ -64,6 +64,6 @@ declare function authorize(params: {
     /**
      * オファーID指定なしに座席をおさえる場合true
      */
-    withoutOfferId: boolean;
+    noOfferSpecified: boolean;
 }): IAuthorizeOperation<IAuthorizeOfferAction>;
 export { authorize };

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

@@ -21,6 +21,7 @@ const factory_1 = require("./factory");
 function authorize(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const noOfferSpecified = params.noOfferSpecified === true;
         const { transaction, event, bookingServiceIdentifire } = yield validateCreateRequest(params)({ event: repos.event, transaction: repos.transaction });
         const { acceptedOffers, ticketOffers, unitPriceOffers } = yield validateAcceptedOffers({
             object: params.object,
@@ -28,7 +29,7 @@ function authorize(params) {
             seller: { typeOf: transaction.seller.typeOf, id: String(transaction.seller.id) },
             transaction,
             store: params.store,
-            withoutOfferId: params.withoutOfferId
+            noOfferSpecified
         })(repos);
         let acceptedOffers4result = [];
         let transactionNumber;
@@ -96,16 +97,12 @@ function authorize(params) {
             }
             throw error;
         }
-        // 金額計算
-        const amount = (0, factory_1.acceptedOffers2amount)({ acceptedOffers: acceptedOffers4result });
-        const result = {
-            price: amount,
-            priceCurrency: acceptedOffers[0].priceCurrency,
-            amount: [],
-            requestBody: {},
-            responseBody: {},
-            acceptedOffers: acceptedOffers4result
-        };
+        const result = Object.assign({ priceCurrency: acceptedOffers[0].priceCurrency, amount: [], requestBody: {}, responseBody: {} }, (!noOfferSpecified) // オファー指定の場合のみ金額計算(2023-11-27~)
+            ? {
+                price: (0, factory_1.acceptedOffers2amount)({ acceptedOffers: acceptedOffers4result }),
+                acceptedOffers: acceptedOffers4result
+            }
+            : undefined);
         return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }
@@ -146,7 +143,7 @@ function validateAcceptedOffers(params) {
         let ticketOffers;
         let unitPriceOffers;
         let acceptedOffersWithoutDetail = params.object.acceptedOffer;
-        if (params.withoutOfferId === true) {
+        if (params.noOfferSpecified === true) {
             if (Array.isArray(acceptedOffersWithoutDetail)) {
                 acceptedOffersWithoutDetail = acceptedOffersWithoutDetail.map((offerWithoutDetail) => {
                     return Object.assign(Object.assign({}, offerWithoutDetail), { id: defaultOffer_1.DEFAULT_OFFER_ID });
@@ -156,7 +153,7 @@ function validateAcceptedOffers(params) {
         const offerIds = (Array.isArray(acceptedOffersWithoutDetail))
             ? [...new Set(acceptedOffersWithoutDetail.map((o) => o.id))]
             : [];
-        if (params.withoutOfferId === true) {
+        if (params.noOfferSpecified === true) {
             if (Array.isArray(acceptedOffersWithoutDetail)) {
                 acceptedOffersWithoutDetail = acceptedOffersWithoutDetail.map((offerWithoutDetail) => {
                     return Object.assign(Object.assign({}, offerWithoutDetail), { id: defaultOffer_1.DEFAULT_OFFER_ID });

package/lib/chevre/service/offer/event/defaultOffer.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../../../factory';
-declare const DEFAULT_OFFER_ID = "********";
+declare const DEFAULT_OFFER_ID = "****AUTOMATICALLY_APPLIED****";
 declare const DEFAULT_TICKET_OFFER: factory.product.ITicketOffer;
 declare const DEFAULT_AVAILABLE_OFFER: factory.unitPriceOffer.IUnitPriceOffer;
 export { DEFAULT_OFFER_ID, DEFAULT_TICKET_OFFER, DEFAULT_AVAILABLE_OFFER };

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_AVAILABLE_OFFER = exports.DEFAULT_TICKET_OFFER = exports.DEFAULT_OFFER_ID = void 0;
 const factory = require("../../../factory");
-const DEFAULT_OFFER_ID = '********';
+const DEFAULT_OFFER_ID = '****AUTOMATICALLY_APPLIED****';
 exports.DEFAULT_OFFER_ID = DEFAULT_OFFER_ID;
-const DEFAULT_OFFER_IDENTIFIER = '********';
-const DEFAULT_OFFER_NAME = '********';
+const DEFAULT_OFFER_IDENTIFIER = '****AUTOMATICALLY_APPLIED****';
+const DEFAULT_OFFER_NAME = '****AUTOMATICALLY_APPLIED****';
 const unitPriceSpecification = {
     typeOf: factory.priceSpecificationType.UnitPriceSpecification,
     name: { ja: DEFAULT_OFFER_NAME, en: DEFAULT_OFFER_NAME },
@@ -17,23 +17,16 @@ const unitPriceSpecification = {
         value: 1,
         unitCode: factory.unitCode.C62
     }
-    // accounting: {}
 };
 const DEFAULT_TICKET_OFFER = {
     name: { ja: DEFAULT_OFFER_NAME, en: DEFAULT_OFFER_NAME },
-    // description: {},
-    // alternateName: {},
-    // color: 'rgb(117, 148, 188)',
+    description: { ja: DEFAULT_OFFER_NAME, en: DEFAULT_OFFER_NAME },
+    additionalProperty: [],
     typeOf: factory.offerType.Offer,
     id: DEFAULT_OFFER_ID,
     priceCurrency: factory.priceCurrency.JPY,
     identifier: DEFAULT_OFFER_IDENTIFIER,
     itemOffered: { typeOf: factory.product.ProductType.EventService },
-    // eligibleQuantity: {
-    //     typeOf: 'QuantitativeValue',
-    //     unitCode: chevre.factory.unitCode.C62,
-    //     maxValue: 6
-    // },
     priceSpecification: {
         typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
         priceCurrency: factory.priceCurrency.JPY,
@@ -41,11 +34,6 @@ const DEFAULT_TICKET_OFFER = {
         priceComponent: [unitPriceSpecification]
     },
     availability: factory.itemAvailability.InStock
-    // sortIndex: 0,
-    // offerIndex: 0,
-    // parentOffer: {
-    //     id: '1001'
-    // }
 };
 exports.DEFAULT_TICKET_OFFER = DEFAULT_TICKET_OFFER;
 const DEFAULT_AVAILABLE_OFFER = {

package/lib/chevre/service/offer/event/factory.d.ts

@@ -3,8 +3,8 @@ import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
 export type IReservationFor = factory.reservation.IReservationFor<factory.reservationType.EventReservation>;
 export type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>;
-export type IObjectWithoutDetail = factory.action.authorize.offer.seatReservation.IObjectWithoutDetail4chevre;
-export type IObjectWithDetail = factory.action.authorize.offer.seatReservation.IObject<factory.service.webAPI.Identifier.Chevre>;
+export type IObjectWithoutDetail = factory.action.authorize.offer.eventService.IObjectWithoutDetail4chevre;
+export type IObjectWithDetail = factory.action.authorize.offer.eventService.IObject<factory.service.webAPI.Identifier.Chevre>;
 export declare function createReserveTransactionStartParams(params: {
     project: {
         id: string;
@@ -14,17 +14,17 @@ export declare function createReserveTransactionStartParams(params: {
     transactionNumber: string;
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
-    acceptedOffers: factory.action.authorize.offer.seatReservation.IAcceptedOffer4chevre[];
+    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
-    pendingTransaction?: factory.action.authorize.offer.seatReservation.IChevrePendingTransaction | undefined;
+    pendingTransaction?: factory.action.authorize.offer.eventService.IChevrePendingTransaction | undefined;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
-}): factory.action.authorize.offer.seatReservation.IAttributes<factory.service.webAPI.Identifier.Chevre>;
+}): factory.action.authorize.offer.eventService.IAttributes<factory.service.webAPI.Identifier.Chevre>;
 export declare function acceptedOffers2amount(params: {
     acceptedOffers: IResultAcceptedOffer[];
 }): number;
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
-type IResultAcceptedOffer = factory.action.authorize.offer.seatReservation.IResultAcceptedOffer;
+type IResultAcceptedOffer = factory.action.authorize.offer.eventService.IResultAcceptedOffer;
 export declare function responseBody2acceptedOffers4result(params: {
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
     objectSubReservations: IObjectSubReservation[];

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

@@ -96,7 +96,7 @@ function createAuthorizeSeatReservationActionAttributes(params) {
     return {
         project: transaction.project,
         typeOf: factory.actionType.AuthorizeAction,
-        object: Object.assign(Object.assign({ typeOf: factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation, event: authorizeObjectEvent, 
+        object: Object.assign(Object.assign({ typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation, event: authorizeObjectEvent, 
             // ↓不要なので廃止(2022-06-07~)
             // reservationFor: { id: event.id },
             acceptedOffer: acceptedOffers }, (params.pendingTransaction !== undefined) ? { pendingTransaction: params.pendingTransaction } : undefined), (params.broker !== undefined) ? { broker: params.broker } : undefined),

package/lib/chevre/service/offer/event/processStartReserve4chevre.d.ts

@@ -13,7 +13,7 @@ import type { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLi
 import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
-type IAuthorizeOfferAction = factory.action.authorize.offer.seatReservation.IAction<factory.service.webAPI.Identifier>;
+type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
 declare function processStartReserve4chevre(params: {
     action: IAuthorizeOfferAction;
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
@@ -44,6 +44,6 @@ declare function processStartReserve4chevre(params: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{
-    acceptedOffers4result: import("@chevre/factory/lib/action/authorize/offer/seatReservation").IResultAcceptedOffer[];
+    acceptedOffers4result: import("@chevre/factory/lib/action/authorize/offer/eventService").IResultAcceptedOffer[];
 }>;
 export { processStartReserve4chevre };

package/lib/chevre/service/offer/event/searchEventTicketOffers.d.ts

@@ -1,5 +1,5 @@
 import type { MongoRepository as EventRepo } from '../../../repo/event';
-import type { MongoRepository as OfferRepo } from '../../../repo/offer';
+import type { IPriceSpecificationConditionsOnSearchWithSortIndex, MongoRepository as OfferRepo } from '../../../repo/offer';
 import type { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { MongoRepository as OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
 import type { MongoRepository as PriceSpecificationRepo } from '../../../repo/priceSpecification';
@@ -41,7 +41,7 @@ declare function searchEventTicketOffers(params: {
      * 有効期間内のみかどうか
      */
     onlyValid: boolean;
-    priceSpecification: Pick<factory.unitPriceOffer.IPriceSpecificationSearchConditions, 'appliesToMovieTicket'>;
+    priceSpecification: IPriceSpecificationConditionsOnSearchWithSortIndex;
     includedInDataCatalog: {
         id: string;
     };