@chevre/domain 24.0.0-alpha.9 → 24.0.0

package/lib/chevre/service/notification/triggerWebhook.js

@@ -15,18 +15,28 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.triggerWebhook = triggerWebhook;
 const crypto = __importStar(require("crypto"));
 const http_status_1 = require("http-status");
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
 function triggerWebhook(params) {
     return async (repos) => {
@@ -34,10 +44,10 @@ function triggerWebhook(params) {
         const retryCountMax = setting?.triggerWebhook?.retryCountMax;
         const retryIntervalInMS = setting?.triggerWebhook?.retryIntervalInMS;
         if (typeof retryCountMax !== 'number') {
-            throw new factory.errors.NotFound('setting.triggerWebhook.retryCountMax');
+            throw new factory_1.factory.errors.NotFound('setting.triggerWebhook.retryCountMax');
         }
         if (typeof retryIntervalInMS !== 'number') {
-            throw new factory.errors.NotFound('setting.triggerWebhook.retryIntervalInMS');
+            throw new factory_1.factory.errors.NotFound('setting.triggerWebhook.retryIntervalInMS');
         }
         // retryableにする(2023-05-12~)
         let retry = true;
@@ -82,21 +92,21 @@ function createInformActionAttributes(params) {
         //     ...recipient
         //     // url: target.urlTemplate // discontinue(2025-02-15~)
         // };
-        if (recipient?.typeOf === factory.organizationType.Corporation && typeof recipient.id === 'string') {
+        if (recipient?.typeOf === factory_1.factory.organizationType.Corporation && typeof recipient.id === 'string') {
             informRecipient = {
                 id: recipient.id,
                 name: recipient.name,
                 typeOf: recipient.typeOf
             };
         }
-        else if (recipient?.typeOf === factory.creativeWorkType.WebApplication) {
+        else if (recipient?.typeOf === factory_1.factory.creativeWorkType.WebApplication) {
             informRecipient = {
                 name: recipient.name,
                 typeOf: recipient.typeOf
             };
         }
         let target;
-        if (typeOf === factory.actionType.InformAction && typeof id === 'string' && id !== '') {
+        if (typeOf === factory_1.factory.actionType.InformAction && typeof id === 'string' && id !== '') {
             // find target from potentialAction(2025-02-06~)
             const potentialInformAction = (await repos.potentialAction.projectFields({
                 limit: 1,
@@ -105,7 +115,7 @@ function createInformActionAttributes(params) {
                 typeOf: { $eq: typeOf }
             }, ['target', 'recipient'])).shift();
             if (potentialInformAction === undefined) {
-                throw new factory.errors.NotFound(factory.actionType.InformAction);
+                throw new factory_1.factory.errors.NotFound(factory_1.factory.actionType.InformAction);
             }
             if (typeof potentialInformAction.recipient?.name === 'string') {
                 informRecipient = { name: potentialInformAction.recipient.name, typeOf: potentialInformAction.recipient.typeOf };
@@ -118,17 +128,17 @@ function createInformActionAttributes(params) {
             }
         }
         if (informRecipient === undefined) {
-            throw new factory.errors.ArgumentNull('recipient');
+            throw new factory_1.factory.errors.ArgumentNull('recipient');
         }
         if (target === undefined) {
-            throw new factory.errors.ArgumentNull('target');
+            throw new factory_1.factory.errors.ArgumentNull('target');
         }
         return {
-            agent: { id: project.id, typeOf: factory.organizationType.Project },
+            agent: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
             object,
-            project: { id: project.id, typeOf: factory.organizationType.Project },
+            project: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
             recipient: informRecipient,
-            typeOf: factory.actionType.InformAction,
+            typeOf: factory_1.factory.actionType.InformAction,
             ...(typeof purpose?.typeOf === 'string') ? { purpose } : undefined,
             ...(typeof about?.typeOf === 'string') ? { about } : undefined, // add(2025-01-23~)
             ...(typeof target?.typeOf === 'string') ? { target } : undefined // add(2025-02-06~)
@@ -145,7 +155,6 @@ function signRequest(params) {
 function processInformAction(params, options) {
     return async (repos) => {
         const timeout = options?.triggerWebhook?.timeout;
-        const useFetchAPI = options?.triggerWebhook?.useFetchAPI === true;
         const secretKey = options?.triggerWebhook?.secretKey;
         const headerIdentifier = options?.triggerWebhook?.headerIdentifier;
         const { identifier } = params;
@@ -170,63 +179,59 @@ function processInformAction(params, options) {
                     && typeof headerIdentifier === 'string' && headerIdentifier !== '') {
                     signature = signRequest({ requestBody, timestamp, secretKey });
                 }
-                if (useFetchAPI) {
-                    const headers = new Headers({ 'Content-Type': 'application/json' });
-                    if (typeof headerIdentifier === 'string' && headerIdentifier !== '') {
-                        headers.append(`X-${headerIdentifier}-Webhook-Timestamp`, String(timestamp));
-                        if (typeof signature === 'string') {
-                            headers.append(`X-${headerIdentifier}-Webhook-Signature`, signature);
-                        }
-                    }
-                    const res = await fetch(urlTemplate, {
-                        method: 'POST',
-                        headers,
-                        body: requestBody, // body data type must match "Content-Type" header
-                        ...(typeof timeout === 'number')
-                            ? { signal: AbortSignal.timeout(timeout) }
-                            : undefined
-                    });
-                    let body;
-                    try {
-                        body = await res.text();
+                const headers = new Headers({ 'Content-Type': 'application/json' });
+                if (typeof headerIdentifier === 'string' && headerIdentifier !== '') {
+                    headers.append(`X-${headerIdentifier}-Webhook-Timestamp`, String(timestamp));
+                    if (typeof signature === 'string') {
+                        headers.append(`X-${headerIdentifier}-Webhook-Signature`, signature);
                     }
-                    catch (error) {
-                        // no op
+                }
+                const res = await fetch(urlTemplate, {
+                    method: 'POST',
+                    headers,
+                    body: requestBody, // body data type must match "Content-Type" header
+                    ...(typeof timeout === 'number')
+                        ? { signal: AbortSignal.timeout(timeout) }
+                        : undefined
+                });
+                let body;
+                try {
+                    body = await res.text();
+                }
+                catch (_error) {
+                    // no op
+                }
+                switch (res.status) {
+                    case http_status_1.status.OK:
+                    case http_status_1.status.CREATED:
+                    case http_status_1.status.ACCEPTED:
+                    case http_status_1.status.NO_CONTENT: {
+                        result = {
+                            statusCode: res.status,
+                            useFetchAPI: true
+                        };
+                        break;
                     }
-                    switch (res.status) {
-                        case http_status_1.OK:
-                        case http_status_1.CREATED:
-                        case http_status_1.ACCEPTED:
-                        case http_status_1.NO_CONTENT:
-                            result = {
-                                statusCode: res.status,
-                                useFetchAPI
-                            };
-                            break;
-                        default:
-                            throw new factory.errors.Internal(`statusCode: ${res.status} body: ${body}`);
+                    default: {
+                        // プロジェクト固有の特別対応
+                        const ignoreUnexpectedResponse = res.status === http_status_1.status.INTERNAL_SERVER_ERROR
+                            && typeof body === 'string'
+                            && body.includes(USERNAME_ARGUMENT_REQUIRED_MESSAGE);
+                        if (!ignoreUnexpectedResponse) {
+                            throw new factory_1.factory.errors.Internal(`statusCode: ${res.status} body: ${body}`);
+                        }
                     }
                 }
-                else {
-                    throw new factory.errors.NotImplemented('only useFetchAPI implemented');
-                }
             }
         }
         catch (error) {
-            let throwsError = true;
-            // プロジェクト固有の特別対応
-            if (error.statusCode === http_status_1.INTERNAL_SERVER_ERROR && error.body?.message === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
-                throwsError = false;
+            try {
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
-            if (throwsError) {
-                try {
-                    await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
-                }
-                catch (__) {
-                    // 失敗したら仕方ない
-                }
-                throw error;
+            catch (__) {
+                // 失敗したら仕方ない
             }
+            throw error;
         }
         await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
     };

package/lib/chevre/service/offer/any.d.ts

@@ -1,16 +1,16 @@
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 import type { OrderInTransactionRepo } from '../../repo/orderInTransaction';
 interface IAcceptOfferOperationRepos {
     orderInTransaction: OrderInTransactionRepo;
 }
 type IAcceptOfferOperation<T> = (repos: IAcceptOfferOperationRepos) => Promise<T>;
-export type IAuthorizeActionWithInstrument = Pick<factory.action.authorize.offer.moneyTransfer.IAction | factory.action.authorize.offer.product.IAction | factory.action.authorize.offer.eventService.IAction, 'instrument'>;
+export type IAuthorizeActionWithInstrument = Pick<factory.action.authorize.offer.eventService.IAction, 'instrument'>;
 export declare function acceptOffer(params: {
     orderNumber: string;
     project: {
         id: string;
     };
-    acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    acceptedOffers: factory.order.IAcceptedOffer[];
 }): IAcceptOfferOperation<void>;
 export declare function voidAcceptedOffer(params: {
     /**

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

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.acceptOffer = acceptOffer;
 exports.voidAcceptedOffer = voidAcceptedOffer;
 const debug_1 = __importDefault(require("debug"));
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:offer');
 function acceptOffer(params) {
     return async (repos) => {
         await repos.orderInTransaction.acceptOffer({
             orderNumber: params.orderNumber,
-            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
             acceptedOffers: params.acceptedOffers
         });
     };

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

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

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

@@ -1,73 +1,50 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_AVAILABLE_OFFER = exports.DEFAULT_TICKET_OFFER = exports.DEFAULT_OFFER_ID = void 0;
-const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("../../../../factory");
 const DEFAULT_OFFER_ID = '****AUTOMATICALLY_APPLIED****';
 exports.DEFAULT_OFFER_ID = DEFAULT_OFFER_ID;
 const DEFAULT_OFFER_IDENTIFIER = '****AUTOMATICALLY_APPLIED****';
 const DEFAULT_OFFER_NAME = '****AUTOMATICALLY_APPLIED****';
 const unitPriceSpecification = {
-    typeOf: factory.priceSpecificationType.UnitPriceSpecification,
+    typeOf: factory_1.factory.priceSpecificationType.UnitPriceSpecification,
     name: { ja: DEFAULT_OFFER_NAME, en: DEFAULT_OFFER_NAME },
     price: -1,
-    priceCurrency: factory.priceCurrency.JPY,
+    priceCurrency: factory_1.factory.priceCurrency.JPY,
     valueAddedTaxIncluded: true,
     referenceQuantity: {
         typeOf: 'QuantitativeValue',
         value: 1,
-        unitCode: factory.unitCode.C62
+        unitCode: factory_1.factory.unitCode.C62
     }
 };
 const DEFAULT_TICKET_OFFER = {
     name: { ja: DEFAULT_OFFER_NAME, en: DEFAULT_OFFER_NAME },
     description: { ja: DEFAULT_OFFER_NAME, en: DEFAULT_OFFER_NAME },
     additionalProperty: [],
-    typeOf: factory.offerType.Offer,
+    typeOf: factory_1.factory.offerType.Offer,
     id: DEFAULT_OFFER_ID,
-    priceCurrency: factory.priceCurrency.JPY,
+    priceCurrency: factory_1.factory.priceCurrency.JPY,
     identifier: DEFAULT_OFFER_IDENTIFIER,
-    itemOffered: { typeOf: factory.product.ProductType.EventService },
+    itemOffered: { typeOf: factory_1.factory.product.ProductType.EventService },
     priceSpecification: {
-        typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
-        priceCurrency: factory.priceCurrency.JPY,
+        typeOf: factory_1.factory.priceSpecificationType.CompoundPriceSpecification,
+        priceCurrency: factory_1.factory.priceCurrency.JPY,
         valueAddedTaxIncluded: true,
         priceComponent: [unitPriceSpecification]
     },
-    availability: factory.itemAvailability.InStock
+    availability: factory_1.factory.itemAvailability.InStock
 };
 exports.DEFAULT_TICKET_OFFER = DEFAULT_TICKET_OFFER;
 const DEFAULT_AVAILABLE_OFFER = {
-    project: { id: '', typeOf: factory.organizationType.Project },
-    priceCurrency: factory.priceCurrency.JPY,
+    project: { id: '', typeOf: factory_1.factory.organizationType.Project },
+    priceCurrency: factory_1.factory.priceCurrency.JPY,
     id: DEFAULT_OFFER_ID,
-    availability: factory.itemAvailability.InStock,
+    availability: factory_1.factory.itemAvailability.InStock,
     identifier: DEFAULT_OFFER_IDENTIFIER,
-    itemOffered: { typeOf: factory.product.ProductType.EventService },
+    itemOffered: { typeOf: factory_1.factory.product.ProductType.EventService },
     name: { ja: DEFAULT_OFFER_NAME, en: DEFAULT_OFFER_NAME },
     priceSpecification: unitPriceSpecification,
-    typeOf: factory.offerType.Offer
+    typeOf: factory_1.factory.offerType.Offer
 };
 exports.DEFAULT_AVAILABLE_OFFER = DEFAULT_AVAILABLE_OFFER;

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

@@ -1,4 +1,4 @@
-import * as factory from '../../../../factory';
+import { factory } from '../../../../factory';
 import { IMinimizedIndividualEvent } from '../../../../factory/event';
 declare function createReserveTransactionStartParams(params: {
     project: {
@@ -8,7 +8,7 @@ declare function createReserveTransactionStartParams(params: {
     event: {
         id: string;
     };
-    broker?: factory.reservation.IBroker<factory.reservationType>;
+    broker?: factory.reservation.IBroker;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller'>;
     transactionNumber: string;
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;
@@ -32,7 +32,9 @@ declare function acceptedOffers2authorizeResult(params: {
     ticketOffers: factory.product.ITicketOffer[];
 }): factory.action.authorize.offer.eventService.IResult;
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
-export type IResultAcceptedOffer = factory.order.IAcceptedOffer<factory.order.IReservation>;
+export type IResultAcceptedOffer = factory.order.IAcceptedOffer & {
+    itemOffered: factory.order.IReservation;
+};
 declare function responseBody2acceptedOffers4result(params: {
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
     reservationFor: factory.assetTransaction.reserve.IReservationFor;