@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/service/assetTransaction/registerService.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.start = start;
 exports.confirm = confirm;
@@ -27,8 +18,8 @@ const PermitService = require("../permit");
  * 取引開始
  */
 function start(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const project = yield repos.project.findById({
+    return async (repos) => {
+        const project = await repos.project.findById({
             id: params.project.id,
             inclusion: ['typeOf']
         });
@@ -46,7 +37,7 @@ function start(params) {
             throw new factory.errors.ArgumentNull('object.itemOffered.id');
         }
         // プロダクト確認
-        const product = (yield repos.product.projectFields({
+        const product = (await repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: productId }
@@ -66,7 +57,7 @@ function start(params) {
         }
         // サービスアウトプット作成
         const dateIssued = new Date();
-        const transactionObject = yield createTransactionObject({
+        const transactionObject = await createTransactionObject({
             acceptedOffers,
             dateIssued,
             product,
@@ -85,26 +76,26 @@ function start(params) {
         // 取引作成
         let transaction;
         try {
-            transaction = yield repos.assetTransaction.start(startParams);
+            transaction = await repos.assetTransaction.start(startParams);
         }
         catch (error) {
             throw error;
         }
         // 必要あれば在庫確認など
-        const serviceOutputs = transactionObject.map((o) => { var _a; return (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput; });
+        const serviceOutputs = transactionObject.map((o) => o.itemOffered?.serviceOutput);
         // サービスアウトプット保管
-        yield PermitService.issue({
+        await PermitService.issue({
             project: { id: project.id },
             issuedThrough: { typeOf: product.typeOf },
             serviceOutputs
         })(repos);
         return transaction;
-    });
+    };
 }
 function createTransactionObject(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // オファー検索
-        const offers = yield (0, searchProductOffers_1.searchProductOffers)({
+        const offers = await (0, searchProductOffers_1.searchProductOffers)({
             ids: params.acceptedOffers.map((o) => o.id),
             itemOffered: { id: String(params.product.id) },
             onlyValid: true,
@@ -118,7 +109,7 @@ function createTransactionObject(params) {
             if (offer === undefined) {
                 throw new factory.errors.NotFound('Offer', `Offer ${acceptedOffer.id} not found`);
             }
-            yield validatePointAward({ project: { id: params.project.id }, acceptedOffer })(repos);
+            await validatePointAward({ project: { id: params.project.id }, acceptedOffer })(repos);
             const pointAward = (0, factory_1.createPointAward)({
                 acceptedOffer: acceptedOffer,
                 offer: offer
@@ -133,18 +124,21 @@ function createTransactionObject(params) {
             transactionObject.push({
                 typeOf: factory.offerType.Offer,
                 id: String(offer.id),
-                itemOffered: Object.assign({ 
+                itemOffered: {
                     // project: params.product.project,
-                    typeOf: params.product.typeOf, id: String(params.product.id), serviceOutput: serviceOutput }, (pointAward !== undefined) ? { pointAward } : undefined)
+                    typeOf: params.product.typeOf,
+                    id: String(params.product.id),
+                    serviceOutput: serviceOutput,
+                    ...(pointAward !== undefined) ? { pointAward } : undefined
+                }
             });
         }
         return transactionObject;
-    });
+    };
 }
 function createPermitService(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const product = (yield repos.product.projectFields({
+    return async (repos) => {
+        const product = (await repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id }
@@ -154,19 +148,19 @@ function createPermitService(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
-        const permitServiceEndpoint = (_a = product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
-        const permitServiceAuthorizeServerDomain = (_c = (_b = product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
-        const permitServiceClientId = (_e = (_d = product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;
-        const permitServiceClientSecret = (_g = (_f = product.availableChannel) === null || _f === void 0 ? void 0 : _f.credentials) === null || _g === void 0 ? void 0 : _g.clientSecret;
+        const permitServiceEndpoint = product.availableChannel?.serviceUrl;
+        const permitServiceAuthorizeServerDomain = product.availableChannel?.credentials?.authorizeServerDomain;
+        const permitServiceClientId = product.availableChannel?.credentials?.clientId;
+        const permitServiceClientSecret = product.availableChannel?.credentials?.clientSecret;
         if (typeof permitServiceEndpoint !== 'string' || permitServiceEndpoint.length === 0
             || typeof permitServiceAuthorizeServerDomain !== 'string' || permitServiceAuthorizeServerDomain.length === 0
             || typeof permitServiceClientId !== 'string' || permitServiceClientId.length === 0
             || typeof permitServiceClientSecret !== 'string' || permitServiceClientSecret.length === 0) {
             throw new factory.errors.Internal('product availableChannel invalid');
         }
-        return new (yield pecorinoapi.loadPecorino()).service.Permit({
+        return new (await pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceEndpoint,
-            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
+            auth: await pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: permitServiceAuthorizeServerDomain,
                 clientId: permitServiceClientId,
                 clientSecret: permitServiceClientSecret,
@@ -174,43 +168,42 @@ function createPermitService(params) {
                 state: ''
             })
         });
-    });
+    };
 }
 function validatePointAward(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+    return async (repos) => {
         // Permit識別子確認
-        const permitIdentifier = (_c = (_b = (_a = params.acceptedOffer.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 issuedThroughId = (_e = (_d = params.acceptedOffer.itemOffered.pointAward) === null || _d === void 0 ? void 0 : _d.toLocation) === null || _e === void 0 ? void 0 : _e.issuedThrough.id;
+        const permitIdentifier = params.acceptedOffer.itemOffered?.pointAward?.toLocation?.identifier;
+        const issuedThroughId = params.acceptedOffer.itemOffered.pointAward?.toLocation?.issuedThrough.id;
         if (typeof permitIdentifier === 'string' && permitIdentifier.length > 0) {
             if (typeof issuedThroughId !== 'string' || issuedThroughId.length === 0) {
                 throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.pointAward.toLocation.issuedThrough.id');
             }
             // pointAwardの指定がある場合、Permitの存在確認
-            const permitService = yield createPermitService({ issuedThrough: { id: issuedThroughId } })(repos);
-            yield permitService.findByIdentifier({
+            const permitService = await createPermitService({ issuedThrough: { id: issuedThroughId } })(repos);
+            await permitService.findByIdentifier({
                 project: { id: params.project.id },
                 identifier: permitIdentifier,
                 issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
             });
         }
-    });
+    };
 }
 /**
  * 取引確定
  */
 function confirm(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
-            transaction = yield repos.assetTransaction.findById({
+            transaction = await repos.assetTransaction.findById({
                 typeOf: factory.assetTransactionType.RegisterService,
                 id: params.id
             });
         }
         else if (typeof params.transactionNumber === 'string') {
-            transaction = yield repos.assetTransaction.findByTransactionNumber({
+            transaction = await repos.assetTransaction.findByTransactionNumber({
                 typeOf: factory.assetTransactionType.RegisterService,
                 transactionNumber: params.transactionNumber
             });
@@ -218,38 +211,38 @@ function confirm(params) {
         else {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
-        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
+        const potentialActions = await (0, potentialActions_1.createPotentialActions)({
             transaction: transaction,
             endDate: params.endDate
         });
         // 取引確定
         const result = {};
-        yield repos.assetTransaction.confirm({
+        await repos.assetTransaction.confirm({
             typeOf: factory.assetTransactionType.RegisterService,
             id: transaction.id,
             result: result,
             potentialActions: potentialActions
         });
-    });
+    };
 }
 /**
  * 取引中止
  */
 function cancel(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield repos.assetTransaction.cancel({
+    return async (repos) => {
+        await repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.RegisterService,
             id: params.id,
             transactionNumber: params.transactionNumber
         });
-    });
+    };
 }
 /**
  * 取引タスク出力
  */
 function exportTasksById(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.assetTransaction.findById({
+    return async (repos) => {
+        const transaction = await repos.assetTransaction.findById({
             typeOf: factory.assetTransactionType.RegisterService,
             id: params.id
         });
@@ -306,5 +299,5 @@ function exportTasksById(params) {
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
         return repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/reserve/cancel.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.cancel = cancel;
 const factory = require("../../../factory");
@@ -16,11 +7,11 @@ const cancelReservation_1 = require("../../reserve/cancelReservation");
  * 取引中止
  */
 function cancel(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
+    ) => {
         // まず取引状態変更
-        const { id } = yield repos.assetTransaction.cancel({
+        const { id } = await repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.Reserve,
             id: params.id,
             transactionNumber: params.transactionNumber
@@ -32,11 +23,11 @@ function cancel(params) {
         // if (cancelActionAttributes !== undefined) {
         //     await cancelPendingReservation(cancelActionAttributes)(repos);
         // }
-        yield (0, cancelReservation_1.cancelPendingReservation)({
+        await (0, cancelReservation_1.cancelPendingReservation)({
             purpose: {
                 id,
                 typeOf: factory.assetTransactionType.Reserve
             }
         })(repos);
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/reserve/confirm/factory.js

@@ -8,7 +8,6 @@ function createPotentialActions(params) {
     // if (reservationFor === undefined) {
     //     throw new factory.errors.NotFound('transaction.object.reservationFor');
     // }
-    var _a;
     // discontinue(2024-07-01~)
     // const useOptimizeReservation: boolean = !USE_OPTIMIZE_RESERVATION_EXCEPTIONS.includes(transaction.project.id);
     // 予約アクション属性作成
@@ -17,7 +16,7 @@ function createPotentialActions(params) {
     // let reservationPackage: factory.action.reserve.IObject | undefined;
     let underName;
     // purpose:Orderの指定があれば、underName,issuedByを調整(2022-05-23~)
-    if (typeof ((_a = params.order) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+    if (typeof params.order?.typeOf === 'string') {
         const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
         underName = ordre2reservationUnderNameResult.underName;
     }
@@ -81,7 +80,20 @@ function createReservationUnderNameIdentifier(params) {
     ];
 }
 function createReservationUnderName(params) {
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: createReservationUnderNameIdentifier({ order: params.order }), name: String(params.order.customer.name), typeOf: params.order.customer.typeOf }, (typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined), (typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined), (typeof params.order.customer.email === 'string') ? { email: params.order.customer.email } : undefined), (typeof params.order.customer.familyName === 'string') ? { familyName: params.order.customer.familyName } : undefined), (typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined), (typeof params.order.customer.givenName === 'string') ? { givenName: params.order.customer.givenName } : undefined), (typeof params.order.customer.id === 'string') ? { id: params.order.customer.id } : undefined), (typeof params.order.customer.telephone === 'string') ? { telephone: params.order.customer.telephone } : undefined), (typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined);
+    return {
+        identifier: createReservationUnderNameIdentifier({ order: params.order }),
+        name: String(params.order.customer.name),
+        typeOf: params.order.customer.typeOf,
+        ...(typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined,
+        ...(typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined,
+        ...(typeof params.order.customer.email === 'string') ? { email: params.order.customer.email } : undefined,
+        ...(typeof params.order.customer.familyName === 'string') ? { familyName: params.order.customer.familyName } : undefined,
+        ...(typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined,
+        ...(typeof params.order.customer.givenName === 'string') ? { givenName: params.order.customer.givenName } : undefined,
+        ...(typeof params.order.customer.id === 'string') ? { id: params.order.customer.id } : undefined,
+        ...(typeof params.order.customer.telephone === 'string') ? { telephone: params.order.customer.telephone } : undefined,
+        ...(typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined
+    };
 }
 /**
  * 注文者情報を予約者情報へ変換する

package/lib/chevre/service/assetTransaction/reserve/confirm.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.confirm = confirm;
 const factory = require("../../../factory");
@@ -17,20 +8,20 @@ const factory_1 = require("./confirm/factory");
  * 取引確定
  */
 function confirm(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
+    ) => {
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
-            transaction = yield repos.assetTransaction.findById({
+            transaction = await repos.assetTransaction.findById({
                 typeOf: factory.assetTransactionType.Reserve,
                 id: params.id
             }, ['project', 'transactionNumber'] // projection(2024-07-01~)
             );
         }
         else if (typeof params.transactionNumber === 'string') {
-            transaction = yield repos.assetTransaction.findByTransactionNumber({
+            transaction = await repos.assetTransaction.findByTransactionNumber({
                 typeOf: factory.assetTransactionType.Reserve,
                 transactionNumber: params.transactionNumber
             }, ['project', 'transactionNumber'] // projection(2024-07-01~)
@@ -39,7 +30,7 @@ function confirm(params) {
         else {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
-        const order = yield fixOrderAsPurpose(params, transaction)(repos);
+        const order = await fixOrderAsPurpose(params, transaction)(repos);
         const { potentialActions, underName } = (0, factory_1.createPotentialActions)({
             // ...params,
             // transaction,
@@ -47,34 +38,38 @@ function confirm(params) {
         });
         // 取引確定
         const result = {};
-        yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Reserve, id: transaction.id, result: result, 
+        await repos.assetTransaction.confirm({
+            typeOf: factory.assetTransactionType.Reserve,
+            id: transaction.id,
+            result: result,
             // potentialActions: (USE_ASSET_TRANSACTION_SYNC_PROCESSING)
             //     ? { reserve: [] }
             //     : potentialActions, // discontinue(2024-07-01~)
-            potentialActions }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string')
-            ? { object: { underName } }
-            : undefined));
+            potentialActions,
+            ...(typeof underName?.typeOf === 'string')
+                ? { object: { underName } }
+                : undefined
+        });
         // sync対応(2023-01-13~)
-        yield (0, confirmReservation_1.confirmReservation)({
+        await (0, confirmReservation_1.confirmReservation)({
             // optimize(2024-07-01~)
             // actionAttributesList: potentialActions.reserve,
             potentialReserveAction: { object: { reservationNumber: transaction.transactionNumber } },
             useOnReservationConfirmed: true,
             byTask: true
         })(repos);
-    });
+    };
 }
 function fixOrderAsPurpose(params, transaction) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+    return async (repos) => {
         let order;
-        const payPurposeConfirmationNumber = (_c = (_b = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.reserve) === null || _b === void 0 ? void 0 : _b.purpose) === null || _c === void 0 ? void 0 : _c.confirmationNumber;
-        const payPurposeOrderNumber = (_f = (_e = (_d = params.potentialActions) === null || _d === void 0 ? void 0 : _d.reserve) === null || _e === void 0 ? void 0 : _e.purpose) === null || _f === void 0 ? void 0 : _f.orderNumber;
+        const payPurposeConfirmationNumber = params.potentialActions?.reserve?.purpose?.confirmationNumber;
+        const payPurposeOrderNumber = params.potentialActions?.reserve?.purpose?.orderNumber;
         if (typeof payPurposeConfirmationNumber === 'string'
             && payPurposeConfirmationNumber.length > 0
             && typeof payPurposeOrderNumber === 'string'
             && payPurposeOrderNumber.length > 0) {
-            const orders = yield repos.order.projectFields({
+            const orders = await repos.order.projectFields({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: transaction.project.id } },
@@ -87,5 +82,5 @@ function fixOrderAsPurpose(params, transaction) {
             }
         }
         return order;
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/reserve/exportTasksById.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.exportTasksById = exportTasksById;
 const factory = require("../../../factory");
@@ -16,9 +7,9 @@ const factory = require("../../../factory");
  */
 function exportTasksById(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // const { useAssetTransactionSyncProcessing } = settings;
-        const transaction = yield repos.assetTransaction.findById({
+        const transaction = await repos.assetTransaction.findById({
             typeOf: factory.assetTransactionType.Reserve,
             id: params.id
         }, ['status', 'transactionNumber', 'project', 'typeOf'] // projection(2024-07-01~)
@@ -84,5 +75,5 @@ function exportTasksById(params) {
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
         return repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
+    };
 }