@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

package/lib/chevre/service/offer/product/searchProductOffers.js

@@ -1,13 +1,4 @@
 "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.searchProductOffers = searchProductOffers;
 const factory = require("../../../factory");
@@ -15,11 +6,9 @@ const factory = require("../../../factory");
  * プロダクトオファーを検索する
  */
 function searchProductOffers(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos) => {
         // プロダクト検索
-        const productWithOffers = (yield repos.product.projectFields({
+        const productWithOffers = (await repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.itemOffered.id }
@@ -30,14 +19,14 @@ function searchProductOffers(params) {
             throw new factory.errors.NotFound('Product');
         }
         // const offerCatalogId = productWithOffers.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
-        const offerCatalogId = (_b = (_a = productWithOffers.hasOfferCatalog) === null || _a === void 0 ? void 0 : _a.itemListElement.at(0)) === null || _b === void 0 ? void 0 : _b.id;
+        const offerCatalogId = productWithOffers.hasOfferCatalog?.itemListElement.at(0)?.id;
         if (typeof offerCatalogId !== 'string') {
             return [];
         }
         // サブカタログIDを決定
         let subOfferCatalogId = offerCatalogId;
         let isOfferCatalogItem = false;
-        const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: offerCatalogId });
+        const offerCatalogFirstElement = await repos.offerCatalog.findFirstItemListElementById({ id: offerCatalogId });
         if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
             subOfferCatalogId = offerCatalogFirstElement.id;
             isOfferCatalogItem = true;
@@ -50,10 +39,10 @@ function searchProductOffers(params) {
                 throw new factory.errors.NotImplemented('id specification on addSortIndex not implemented');
             }
             // 明示的にカタログ指定可能にする
-            if (typeof ((_c = params.includedInDataCatalog) === null || _c === void 0 ? void 0 : _c.id) === 'string' && params.includedInDataCatalog.id.length > 0) {
+            if (typeof params.includedInDataCatalog?.id === 'string' && params.includedInDataCatalog.id.length > 0) {
                 if (isOfferCatalogItem) {
                     // カタログに含まれるサブカタログか検証(2024-09-30~)
-                    const offerCatalogIncludingSpecifiedElement = yield repos.offerCatalog.projectFields({
+                    const offerCatalogIncludingSpecifiedElement = await repos.offerCatalog.projectFields({
                         limit: 1,
                         page: 1,
                         id: { $in: [offerCatalogId] },
@@ -70,7 +59,7 @@ function searchProductOffers(params) {
                 }
                 subOfferCatalogId = params.includedInDataCatalog.id;
             }
-            const searchByOfferCatalogIdResult = yield repos.offer.searchByOfferCatalogIdWithSortIndex({
+            const searchByOfferCatalogIdResult = await repos.offer.searchByOfferCatalogIdWithSortIndex({
                 offerCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
                 excludeAppliesToMovieTicket: false,
                 priceSpecification: {}, // 絞る必要なし
@@ -91,13 +80,13 @@ function searchProductOffers(params) {
             let includedInDataCatalogIds = [subOfferCatalogId];
             if (isOfferCatalogItem) {
                 // 複数カタログ対応(2023-09-27~)
-                const offerCatalogItems = yield repos.offerCatalog.findItemListElementById({
+                const offerCatalogItems = await repos.offerCatalog.findItemListElementById({
                     id: offerCatalogId,
                     project: { id: productWithOffers.project.id }
                 });
                 includedInDataCatalogIds = offerCatalogItems.itemListElement.map((element) => element.id);
             }
-            const searchByOfferCatalogIdResult = yield repos.offer.searchAllByIdsAndOfferCatalogId({
+            const searchByOfferCatalogIdResult = await repos.offer.searchAllByIdsAndOfferCatalogId({
                 ids: params.ids,
                 includedInDataCatalog: { id: includedInDataCatalogIds, isOfferCatalogItem },
                 excludeAppliesToMovieTicket: false,
@@ -107,10 +96,9 @@ function searchProductOffers(params) {
             offers = searchByOfferCatalogIdResult;
         }
         return offers.map((o) => {
-            var _a;
             let sortIndex;
             if (params.addSortIndex) {
-                sortIndex = sortedOfferIds === null || sortedOfferIds === void 0 ? void 0 : sortedOfferIds.indexOf(String(o.id));
+                sortIndex = sortedOfferIds?.indexOf(String(o.id));
             }
             const unitSpec = o.priceSpecification;
             const compoundPriceSpecification = {
@@ -121,7 +109,25 @@ function searchProductOffers(params) {
                     ...(unitSpec !== undefined) ? [unitSpec] : []
                 ]
             };
-            return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray(o.additionalProperty)) ? o.additionalProperty : [], alternateName: o.alternateName, availability: o.availability, color: o.color, description: o.description, id: o.id, identifier: o.identifier, itemOffered: o.itemOffered, name: o.name, priceCurrency: o.priceCurrency, typeOf: o.typeOf, priceSpecification: compoundPriceSpecification }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined), (typeof sortIndex === 'number') ? { sortIndex } : undefined), (typeof o.offerIndex === 'number') ? { offerIndex: o.offerIndex } : undefined), (typeof ((_a = o.parentOffer) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { parentOffer: { id: o.parentOffer.id } } : undefined);
+            return {
+                additionalProperty: (Array.isArray(o.additionalProperty)) ? o.additionalProperty : [],
+                alternateName: o.alternateName,
+                availability: o.availability,
+                color: o.color,
+                description: o.description,
+                id: o.id,
+                identifier: o.identifier,
+                itemOffered: o.itemOffered,
+                name: o.name,
+                priceCurrency: o.priceCurrency,
+                typeOf: o.typeOf,
+                priceSpecification: compoundPriceSpecification,
+                ...(o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined,
+                ...(o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined,
+                ...(typeof sortIndex === 'number') ? { sortIndex } : undefined,
+                ...(typeof o.offerIndex === 'number') ? { offerIndex: o.offerIndex } : undefined,
+                ...(typeof o.parentOffer?.id === 'string') ? { parentOffer: { id: o.parentOffer.id } } : undefined
+            };
         });
-    });
+    };
 }

package/lib/chevre/service/offer/product.js

@@ -1,13 +1,4 @@
 "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.ERROR_MESSAGE_ALREADY_REGISTERED = void 0;
 exports.search = search;
@@ -26,10 +17,9 @@ exports.ERROR_MESSAGE_ALREADY_REGISTERED = 'Already registered';
  * プロダクトオファーを検索する
  */
 function search(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // const now = moment();
-        var _a;
-        const searchProductsResult = yield repos.product.projectFields({
+        const searchProductsResult = await repos.product.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -44,7 +34,7 @@ function search(params) {
         // 販売者指定の場合、検証
         if (product.typeOf === factory.product.ProductType.MembershipService
             || product.typeOf === factory.product.ProductType.PaymentCard) {
-            const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
+            const sellerId = params.seller?.id;
             if (typeof sellerId === 'string') {
                 // productsドキュメント参照のoffers検証は廃止(2025-09-22~)
                 // const productOffers = await repos.productOffer.search({
@@ -66,7 +56,7 @@ function search(params) {
                 // }
             }
         }
-        const offers = yield (0, searchProductOffers_1.searchProductOffers)({
+        const offers = await (0, searchProductOffers_1.searchProductOffers)({
             ids: params.ids,
             itemOffered: { id: params.itemOffered.id },
             availableAt: params.availableAt,
@@ -78,27 +68,25 @@ function search(params) {
             page: params.page
         })(repos);
         return { offers, product };
-    });
+    };
 }
 /**
  * サービス(Chevreプロダクト)オファー承認
  */
-// tslint:disable-next-line:max-func-body-length
 function authorize(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const now = new Date();
-        const transaction = yield repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'project', 'seller', 'typeOf', 'expires']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        const { product, availableOffers } = yield fixProductAndOffers(params)(repos);
+        const { product, availableOffers } = await fixProductAndOffers(params)(repos);
         // 会員の場合のみ既登録か確認
         if (params.agent.typeOf === factory.personType.Person) {
-            yield checkIfRegistered({
+            await checkIfRegistered({
                 agent: { id: params.agent.id },
                 product: { id: String(product.id), typeOf: product.typeOf },
                 now: now
@@ -106,24 +94,24 @@ function authorize(params) {
             })(repos);
         }
         // ポイント特典の識別子に利用するため注文番号を先に発行
-        const orderNumber = yield (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: new Date() }
         })(repos);
-        let acceptedOffer = yield validateAcceptedOffers({
+        let acceptedOffer = await validateAcceptedOffers({
             object: params.object,
             product,
             availableOffers,
             seller: transaction.seller,
             orderNumber
         })(repos);
-        acceptedOffer = yield createServiceOutputIdentifier({ acceptedOffer, product })(repos);
+        acceptedOffer = await createServiceOutputIdentifier({ acceptedOffer, product })(repos);
         let requestBody;
         let responseBody;
         let result;
         // まず取引番号発行
-        const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({
+        const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({
             startDate: new Date()
         });
         const actionAttributes = (0, factory_1.createActionAttributes)({
@@ -131,7 +119,7 @@ function authorize(params) {
             transaction: transaction,
             transactionNumber: transactionNumber
         });
-        const action = yield repos.action.start(actionAttributes);
+        const action = await repos.action.start(actionAttributes);
         try {
             // 会員の場合のみ排他ロック
             // if (params.agent.typeOf === factory.personType.Person) {
@@ -144,12 +132,12 @@ function authorize(params) {
                 transactionNumber
             });
             requestBody = startParams;
-            responseBody = yield RegisterServiceTransaction.start(startParams)(repos);
+            responseBody = await RegisterServiceTransaction.start(startParams)(repos);
             const acceptedOffers4result = (0, factory_1.responseBody2resultAcceptedOffer)({
                 project: actionAttributes.project, responseBody, acceptedOffer
             });
             result = (0, factory_1.createResult)({ project: actionAttributes.project, requestBody, responseBody, acceptedOffer });
-            yield (0, any_1.acceptOffer)({
+            await (0, any_1.acceptOffer)({
                 orderNumber,
                 project: transaction.project,
                 acceptedOffers: acceptedOffers4result
@@ -157,22 +145,21 @@ function authorize(params) {
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
             }
             throw error;
         }
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id, result };
-    });
+    };
 }
 function fixProductAndOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        const productId = String((_b = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.id);
-        const searchProductsResult = yield repos.product.projectFields({
+    return async (repos) => {
+        const productId = String(params.object[0]?.itemOffered?.id);
+        const searchProductsResult = await repos.product.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -188,14 +175,23 @@ function fixProductAndOffers(params) {
             && product.typeOf !== factory.product.ProductType.PaymentCard) {
             throw new factory.errors.Argument('object.itemOffered.id', `invalid product type: ${product.typeOf}`);
         }
-        const { offers } = yield search(Object.assign({ ids: params.object.map((o) => String(o.id)), project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true, includedInDataCatalog: { id: '' }, addSortIndex: false, useIncludeInDataCatalog: false }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
+        const { offers } = await search({
+            ids: params.object.map((o) => String(o.id)),
+            project: { id: params.project.id },
+            itemOffered: { id: String(product.id) },
+            onlyValid: true,
+            includedInDataCatalog: { id: '' }, // 承認時はカタログ指定の必要なし
+            addSortIndex: false,
+            useIncludeInDataCatalog: false,
+            // 利用アプリケーションを指定
+            ...(typeof params.location?.id === 'string') ? { availableAt: { id: params.location.id } } : undefined
+        })(repos);
         return { product, availableOffers: offers };
-    });
+    };
 }
 function voidTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const transaction = yield repos.transaction.projectFieldsById({
+    return async (repos) => {
+        const transaction = await repos.transaction.projectFieldsById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['agent', 'status', 'typeOf']);
@@ -204,21 +200,21 @@ function voidTransaction(params) {
             && transaction.status !== factory.transactionStatusType.InProgress) {
             throw new factory.errors.Argument('purpose', `invalid transaction status: ${transaction.status}`);
         }
-        if (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+        if (typeof params.agent?.id === 'string') {
             if (transaction.agent.id !== params.agent.id) {
                 throw new factory.errors.Forbidden('Transaction not yours');
             }
         }
         let authorizeActions;
         if (typeof params.id === 'string') {
-            const action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+            const action = await repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
             if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
                 throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
             }
             authorizeActions = [action];
         }
         else {
-            authorizeActions = (yield repos.action.searchByPurpose({
+            authorizeActions = await repos.action.searchByPurpose({
                 typeOf: factory.actionType.AuthorizeAction,
                 purpose: {
                     typeOf: params.purpose.typeOf,
@@ -229,11 +225,10 @@ function voidTransaction(params) {
                 .filter((a) => Array.isArray(a.object)
                 && a.object.length > 0
                 && a.object[0].typeOf === factory.offerType.Offer
-                && availableProductTypes_1.availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0)));
+                && availableProductTypes_1.availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0));
         }
-        yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const productId = (_b = (_a = action.object[0]) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.id;
+        await Promise.all(authorizeActions.map(async (action) => {
+            const productId = action.object[0]?.itemOffered?.id;
             if (typeof productId === 'string') {
                 // 廃止(2023-12-07~)
                 // await processUnlockRegisterMembershipService({
@@ -242,24 +237,23 @@ function voidTransaction(params) {
                 //     purpose: params.purpose
                 // })(repos);
             }
-            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
-            yield processVoidRegisterServiceTransaction({
+            await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
+            await processVoidRegisterServiceTransaction({
                 action,
                 project: params.project
             })(repos);
-        })));
-    });
+        }));
+    };
 }
 /**
  * Chevre進行中取引を中止する
  */
 function processVoidRegisterServiceTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const transactionNumber = (_a = params.action.instrument) === null || _a === void 0 ? void 0 : _a.transactionNumber;
+    return async (repos) => {
+        const transactionNumber = params.action.instrument?.transactionNumber;
         if (typeof transactionNumber === 'string') {
             // 取引が存在すれば中止
-            const searchAssetTransactionsResult = yield repos.assetTransaction.search({
+            const searchAssetTransactionsResult = await repos.assetTransaction.search({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },
@@ -267,17 +261,17 @@ function processVoidRegisterServiceTransaction(params) {
                 transactionNumber: { $eq: transactionNumber }
             });
             if (searchAssetTransactionsResult.length > 0) {
-                yield RegisterServiceTransaction.cancel({ transactionNumber })(repos);
+                await RegisterServiceTransaction.cancel({ transactionNumber })(repos);
                 // await repos.registerServiceTransaction.cancel({ transactionNumber: transactionNumber });
             }
         }
-    });
+    };
 }
 /**
  * 受け入れらたオファーの内容を検証
  */
 function validateAcceptedOffers(params) {
-    return (__) => __awaiter(this, void 0, void 0, function* () {
+    return async (__) => {
         let acceptedOfferWithoutDetail = params.object;
         if (!Array.isArray(acceptedOfferWithoutDetail)) {
             acceptedOfferWithoutDetail = [acceptedOfferWithoutDetail];
@@ -306,15 +300,14 @@ function validateAcceptedOffers(params) {
         // }
         // 利用可能なチケットオファーであれば受け入れる
         return Promise.all(acceptedOfferWithoutDetail.map((offerWithoutDetail) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             const offer = params.availableOffers.find((o) => o.id === offerWithoutDetail.id);
             if (offer === undefined) {
                 throw new factory.errors.NotFound('Offer', `Offer ${offerWithoutDetail.id} not found`);
             }
             // ポイント特典入金先の指定があれば入金識別子を発行
             let pointAward;
-            const pointAwardToLocationIdentifier = (_c = (_b = (_a = offerWithoutDetail.itemOffered) === null || _a === void 0 ? void 0 : _a.pointAward) === null || _b === void 0 ? void 0 : _b.toLocation) === null || _c === void 0 ? void 0 : _c.identifier;
-            const pointAwardToLocationIssuedThroughId = (_f = (_e = (_d = offerWithoutDetail.itemOffered) === null || _d === void 0 ? void 0 : _d.pointAward) === null || _e === void 0 ? void 0 : _e.toLocation) === null || _f === void 0 ? void 0 : _f.issuedThrough.id;
+            const pointAwardToLocationIdentifier = offerWithoutDetail.itemOffered?.pointAward?.toLocation?.identifier;
+            const pointAwardToLocationIssuedThroughId = offerWithoutDetail.itemOffered?.pointAward?.toLocation?.issuedThrough.id;
             if (typeof pointAwardToLocationIdentifier === 'string' && pointAwardToLocationIdentifier.length > 0
                 && typeof pointAwardToLocationIssuedThroughId === 'string' && pointAwardToLocationIssuedThroughId.length > 0) {
                 const pointAwardPurposeIdentifier = (0, accountTransactionIdentifier_1.createPointAwardIdentifier)({
@@ -322,30 +315,51 @@ function validateAcceptedOffers(params) {
                     purpose: { orderNumber: params.orderNumber },
                     toLocation: { identifier: pointAwardToLocationIdentifier }
                 });
-                pointAward = Object.assign({ recipient: (_g = offerWithoutDetail.itemOffered.pointAward) === null || _g === void 0 ? void 0 : _g.recipient, toLocation: {
+                pointAward = {
+                    recipient: offerWithoutDetail.itemOffered.pointAward?.recipient,
+                    toLocation: {
                         identifier: pointAwardToLocationIdentifier,
                         // toLocation.issuedThroughを保証する
                         issuedThrough: { id: pointAwardToLocationIssuedThroughId },
                         typeOf: factory.permit.PermitType.Permit
-                    }, typeOf: factory.actionType.MoneyTransfer, purpose: { identifier: pointAwardPurposeIdentifier } }, (typeof ((_h = offerWithoutDetail.itemOffered.pointAward) === null || _h === void 0 ? void 0 : _h.description) === 'string')
-                    ? { description: offerWithoutDetail.itemOffered.pointAward.description }
-                    : undefined);
+                    },
+                    typeOf: factory.actionType.MoneyTransfer,
+                    purpose: { identifier: pointAwardPurposeIdentifier },
+                    ...(typeof offerWithoutDetail.itemOffered.pointAward?.description === 'string')
+                        ? { description: offerWithoutDetail.itemOffered.pointAward.description }
+                        : undefined
+                };
             }
-            const itemOffered = Object.assign({ 
+            const itemOffered = {
                 // project: project,
-                typeOf: params.product.typeOf, id: params.product.id, name: params.product.name, serviceOutput: Object.assign(Object.assign(Object.assign({}, (_j = params.product) === null || _j === void 0 ? void 0 : _j.serviceOutput), (_k = offerWithoutDetail.itemOffered) === null || _k === void 0 ? void 0 : _k.serviceOutput), { project: project, 
+                typeOf: params.product.typeOf,
+                id: params.product.id,
+                name: params.product.name,
+                serviceOutput: {
+                    ...params.product?.serviceOutput,
+                    ...offerWithoutDetail.itemOffered?.serviceOutput,
+                    project: project,
                     // 発行者は販売者でいったん固定
-                    issuedBy: issuedBy, typeOf: factory.permit.PermitType.Permit }) }, (pointAward !== undefined) ? { pointAward } : undefined);
-            return Object.assign(Object.assign(Object.assign({}, offerWithoutDetail), offer), { itemOffered, seller: { project: project, typeOf: params.seller.typeOf, id: params.seller.id, name: params.seller.name } });
+                    issuedBy: issuedBy,
+                    typeOf: factory.permit.PermitType.Permit
+                },
+                ...(pointAward !== undefined) ? { pointAward } : undefined
+            };
+            return {
+                ...offerWithoutDetail,
+                ...offer,
+                itemOffered,
+                seller: { project: project, typeOf: params.seller.typeOf, id: params.seller.id, name: params.seller.name }
+            };
         }));
-    });
+    };
 }
 function checkIfRegistered(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // メンバーシップについては、登録済かどうか確認する
         if (params.product.typeOf === factory.product.ProductType.MembershipService) {
             // プロダクトによって発行されたPermitを所有していれば、登録済
-            const searchOwnershipInfosResult = yield repos.ownershipInfo.projectFields({
+            const searchOwnershipInfosResult = await repos.ownershipInfo.projectFields({
                 limit: 1,
                 page: 1,
                 ownedBy: { id: params.agent.id },
@@ -365,21 +379,31 @@ function checkIfRegistered(params) {
                 throw new factory.errors.Argument('object', exports.ERROR_MESSAGE_ALREADY_REGISTERED);
             }
         }
-    });
+    };
 }
 function createServiceOutputIdentifier(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const publishParams = params.acceptedOffer.map(() => {
             return { project: { id: params.product.project.id } };
         });
-        const publishIdentifierResult = yield Promise.all(publishParams.map(() => __awaiter(this, void 0, void 0, function* () {
-            const identifier = yield repos.serviceOutputIdentifier.issueServiceOutputIdentifier({ startDate: new Date() });
+        const publishIdentifierResult = await Promise.all(publishParams.map(async () => {
+            const identifier = await repos.serviceOutputIdentifier.issueServiceOutputIdentifier({ startDate: new Date() });
             return { identifier };
-        })));
+        }));
         // 識別子を発行
-        return Promise.all(params.acceptedOffer.map((o, key) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            return Object.assign(Object.assign({}, o), { itemOffered: Object.assign(Object.assign({}, o.itemOffered), { serviceOutput: Object.assign(Object.assign({}, (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput), { project: params.product.project, typeOf: factory.permit.PermitType.Permit, identifier: publishIdentifierResult[key].identifier }) }) });
-        })));
-    });
+        return Promise.all(params.acceptedOffer.map(async (o, key) => {
+            return {
+                ...o,
+                itemOffered: {
+                    ...o.itemOffered,
+                    serviceOutput: {
+                        ...o.itemOffered?.serviceOutput,
+                        project: params.product.project,
+                        typeOf: factory.permit.PermitType.Permit,
+                        identifier: publishIdentifierResult[key].identifier
+                    }
+                }
+            };
+        }));
+    };
 }