@chevre/domain 23.2.0-alpha.8 → 23.2.0

package/lib/chevre/service/offer.js

@@ -1,27 +1,44 @@
 "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());
-    });
+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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
 exports.addOffers2Seat = addOffers2Seat;
 exports.searchEventSeatOffersWithPaging = searchEventSeatOffersWithPaging;
 exports.findEventSeatOffersBySection = findEventSeatOffersBySection;
-const moment = require("moment");
-const factory = require("../factory");
-const EventOfferService = require("./offer/event");
+const moment_1 = __importDefault(require("moment"));
+const factory = __importStar(require("../factory"));
+const EventOfferService = __importStar(require("./offer/event"));
 exports.event = EventOfferService;
-const EventServiceByCOAOfferService = require("./offer/eventServiceByCOA");
+const EventServiceByCOAOfferService = __importStar(require("./offer/eventServiceByCOA"));
 exports.eventServiceByCOA = EventServiceByCOAOfferService;
-const MoneyTransferOfferService = require("./offer/moneyTransfer");
+const MoneyTransferOfferService = __importStar(require("./offer/moneyTransfer"));
 exports.moneyTransfer = MoneyTransferOfferService;
-const ProductOfferService = require("./offer/product");
+const ProductOfferService = __importStar(require("./offer/product"));
 exports.product = ProductOfferService;
 /**
  * 座席にオファー情報を付加する
@@ -51,28 +68,32 @@ function addOffers2Seat(params) {
     if (typeof params.availability === 'string') {
         availability = params.availability;
     }
-    return Object.assign(Object.assign({}, params.seat), { offers: [Object.assign({ availability }, (priceSpecification.priceComponent.length > 0) ? { priceSpecification } : undefined // priceComponentの存在する場合のみ追加(2023-11-08~)
-            )] });
+    return {
+        ...params.seat,
+        offers: [{
+                availability,
+                ...(priceSpecification.priceComponent.length > 0) ? { priceSpecification } : undefined // priceComponentの存在する場合のみ追加(2023-11-08~)
+            }]
+    };
 }
 /**
  * イベントに対する座席オファーを検索する
  */
 function searchEventSeatOffersWithPaging(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        const { useDefaultSection } = params.options;
+    return async (repos) => {
+        const { includeSectionCodeOnlyFirstElement, useDefaultSection } = params.options;
         let offers = [];
         // optimize(2024-07-18~)
-        const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered', 'organizer']);
+        const event = await repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered', 'organizer']);
         // 座席指定利用可能かどうか
         const eventOffers = event.offers;
-        const reservedSeatsAvailable = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;
+        const reservedSeatsAvailable = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         if (reservedSeatsAvailable) {
-            const roomBranchCode = String((_d = (_c = eventOffers.itemOffered) === null || _c === void 0 ? void 0 : _c.availableChannel) === null || _d === void 0 ? void 0 : _d.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String((_f = (_e = eventOffers.itemOffered) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.serviceLocation.containedInPlace.branchCode);
+            const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
+            const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
             let defaultSectionCode;
             if (useDefaultSection) {
-                const defaultSection = (yield repos.section.findSectionsByRoom({
+                const defaultSection = (await repos.section.findSectionsByRoom({
                     limit: 1,
                     page: 1,
                     projectId: event.project.id,
@@ -86,58 +107,91 @@ function searchEventSeatOffersWithPaging(params) {
                 defaultSectionCode = defaultSection.branchCode;
                 // console.log('searchEventSeatOffersWithPaging:defaultSectionCode:', defaultSectionCode);
             }
-            const seats = yield repos.seat.projectSeatsByScreeningRoom(Object.assign(Object.assign({}, params), { project: { id: { $eq: event.project.id } }, screeningRoom: {
+            const seats = await repos.seat.projectSeatsByScreeningRoom({
+                ...params,
+                project: { id: { $eq: event.project.id } },
+                screeningRoom: {
                     branchCode: { $eq: roomBranchCode },
                     containedInPlace: {
                         branchCode: { $eq: movieTheaterBranchCode }
                     }
-                }, containedInPlace: {
-                    branchCode: Object.assign({}, (typeof defaultSectionCode === 'string')
-                        ? { $eq: defaultSectionCode }
-                        : {
-                            $eq: (typeof ((_h = (_g = params.containedInPlace) === null || _g === void 0 ? void 0 : _g.branchCode) === null || _h === void 0 ? void 0 : _h.$eq) === 'string')
-                                ? (_k = (_j = params.containedInPlace) === null || _j === void 0 ? void 0 : _j.branchCode) === null || _k === void 0 ? void 0 : _k.$eq
-                                : undefined
-                        })
-                }, $projection: Object.assign({}, params.$projection) }));
+                },
+                containedInPlace: {
+                    branchCode: {
+                        ...(typeof defaultSectionCode === 'string')
+                            ? { $eq: defaultSectionCode }
+                            : {
+                                $eq: (typeof params.containedInPlace?.branchCode?.$eq === 'string')
+                                    ? params.containedInPlace?.branchCode?.$eq
+                                    : undefined
+                            }
+                    }
+                },
+                $projection: { ...params.$projection }
+            });
             if (seats.length > 0) {
-                const availabilities = yield repos.stockHolder.searchHolders({
+                const availabilities = await repos.stockHolder.searchHolders({
                     project: { id: event.project.id },
                     eventId: params.event.id,
-                    startDate: moment(event.startDate)
+                    startDate: (0, moment_1.default)(event.startDate)
                         .toDate(),
                     hasTicketedSeat: true,
                     offers: seats.map((s) => {
-                        var _a;
                         return {
                             seatNumber: s.branchCode,
-                            seatSection: (_a = s.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode
+                            seatSection: s.containedInPlace?.branchCode
                         };
                     })
                 });
-                offers = seats.map((seat, index) => {
-                    return addOffers2Seat({
-                        seat,
-                        availability: (typeof availabilities[index] === 'string')
-                            ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
-                            : factory.itemAvailability.InStock,
-                        priceSpecs: [] // priceSpecsをレスポンスから廃止(2024-12-22~)
-                    });
+                offers = seats.map(({ branchCode, name, containedInPlace, seatingType }, index) => {
+                    let includeSectionCode = false;
+                    if (includeSectionCodeOnlyFirstElement) {
+                        if (useDefaultSection) {
+                            // デフォルトセクション指定の場合、first elementのみセクションコードを含める
+                            if (index === 0) {
+                                includeSectionCode = true;
+                            }
+                        }
+                        else {
+                            includeSectionCode = true;
+                        }
+                    }
+                    else {
+                        includeSectionCode = true;
+                    }
+                    return {
+                        branchCode,
+                        name,
+                        seatingType,
+                        // ...seat,
+                        offers: [{
+                                availability: (typeof availabilities[index] === 'string')
+                                    ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+                                    : factory.itemAvailability.InStock
+                            }],
+                        ...(includeSectionCode) ? { containedInPlace } : undefined
+                    };
+                    // return addOffers2Seat({
+                    //     seat,
+                    //     availability: (typeof availabilities[index] === 'string')
+                    //         ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+                    //         : factory.itemAvailability.InStock,
+                    //     priceSpecs: [] // priceSpecsをレスポンスから廃止(2024-12-22~)
+                    // });
                 });
             }
         }
         return offers;
-    });
+    };
 }
 /**
  * セクション指定でイベントに対する座席オファーを検索する
  */
 function findEventSeatOffersBySection(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+    return async (repos) => {
         const { limit, page, projectId, sellerId, eventId, sectionCode } = params;
         let offers = [];
-        const event = (yield repos.event.projectEventFields({
+        const event = (await repos.event.projectEventFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: projectId } },
@@ -150,11 +204,11 @@ function findEventSeatOffersBySection(params) {
         }
         // 座席指定利用可能かどうか
         const eventOffers = event.offers;
-        const reservedSeatsAvailable = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;
+        const reservedSeatsAvailable = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         if (reservedSeatsAvailable) {
-            const roomBranchCode = String((_d = (_c = eventOffers.itemOffered) === null || _c === void 0 ? void 0 : _c.availableChannel) === null || _d === void 0 ? void 0 : _d.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String((_f = (_e = eventOffers.itemOffered) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.serviceLocation.containedInPlace.branchCode);
-            const seats = yield repos.seat.projectSeatsByScreeningRoom({
+            const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
+            const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            const seats = await repos.seat.projectSeatsByScreeningRoom({
                 limit,
                 page,
                 project: { id: { $eq: projectId } },
@@ -179,10 +233,10 @@ function findEventSeatOffersBySection(params) {
                 }
             });
             if (seats.length > 0) {
-                const availabilities = yield repos.stockHolder.searchHolders({
+                const availabilities = await repos.stockHolder.searchHolders({
                     project: { id: projectId },
                     eventId,
-                    startDate: moment(event.startDate)
+                    startDate: (0, moment_1.default)(event.startDate)
                         .toDate(),
                     hasTicketedSeat: true,
                     offers: seats.map((s) => {
@@ -205,5 +259,5 @@ function findEventSeatOffersBySection(params) {
             }
         }
         return offers;
-    });
+    };
 }

package/lib/chevre/service/order/confirmPayTransaction.js

@@ -1,25 +1,40 @@
 "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());
-    });
+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.confirmPayTransaction = confirmPayTransaction;
-const factory = require("../../factory");
-const PayTransactionService = require("../assetTransaction/pay");
+const factory = __importStar(require("../../factory"));
+const PayTransactionService = __importStar(require("../assetTransaction/pay"));
 function confirmPayTransaction(data, options) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         // アクション開始
-        const action = yield repos.action.start(data);
+        const action = await repos.action.start(data);
         try {
             for (const confirmingTransaction of data.object) {
-                yield PayTransactionService.confirm(Object.assign({ transactionNumber: confirmingTransaction.transactionNumber, potentialActions: {
+                await PayTransactionService.confirm({
+                    transactionNumber: confirmingTransaction.transactionNumber,
+                    potentialActions: {
                         pay: {
                             purpose: {
                                 typeOf: data.purpose.typeOf,
@@ -27,9 +42,13 @@ function confirmPayTransaction(data, options) {
                                 orderNumber: data.purpose.orderNumber
                             }
                         }
-                    }, options }, (typeof ((_b = (_a = confirmingTransaction.object) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
-                    ? { object: { paymentMethod: { identifier: confirmingTransaction.object.paymentMethod.identifier } } }
-                    : undefined))({
+                    },
+                    options,
+                    // 確定時の決済方法区分指定(2023-08-29~)
+                    ...(typeof confirmingTransaction.object?.paymentMethod?.identifier === 'string')
+                        ? { object: { paymentMethod: { identifier: confirmingTransaction.object.paymentMethod.identifier } } }
+                        : undefined
+                })({
                     acceptedOffer: repos.acceptedOffer,
                     action: repos.action,
                     accountingReport: repos.accountingReport,
@@ -43,7 +62,7 @@ function confirmPayTransaction(data, options) {
         }
         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 (__) {
                 // 失敗したら仕方ない
@@ -52,24 +71,29 @@ function confirmPayTransaction(data, options) {
         }
         // アクション完了
         const actionResult = {};
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         // processOrder連携(2023-08-23~)
-        yield onConfirmed(data)({
+        await onConfirmed(data)({
             task: repos.task
         });
-    });
+    };
 }
 function onConfirmed(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         if (params.processOrder === true) {
             for (const confirmingTransaction of params.object) {
                 // タスク冪等作成
                 const onAssetTransactionStatusChangedTaskData = {
                     project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                    object: Object.assign({ typeOf: factory.assetTransactionType.Pay, transactionNumber: confirmingTransaction.transactionNumber, status: factory.transactionStatusType.Confirmed }, (typeof ((_b = (_a = confirmingTransaction.object) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
-                        ? { object: { paymentMethod: { identifier: confirmingTransaction.object.paymentMethod.identifier } } }
-                        : undefined),
+                    object: {
+                        typeOf: factory.assetTransactionType.Pay,
+                        transactionNumber: confirmingTransaction.transactionNumber,
+                        status: factory.transactionStatusType.Confirmed,
+                        // 確定時の決済方法区分指定(2023-08-29~)
+                        ...(typeof confirmingTransaction.object?.paymentMethod?.identifier === 'string')
+                            ? { object: { paymentMethod: { identifier: confirmingTransaction.object.paymentMethod.identifier } } }
+                            : undefined
+                    },
                     purpose: {
                         confirmationNumber: params.purpose.confirmationNumber,
                         orderNumber: params.purpose.orderNumber,
@@ -87,8 +111,8 @@ function onConfirmed(params) {
                     executionResults: [],
                     data: onAssetTransactionStatusChangedTaskData
                 };
-                yield repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
+                await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
             }
         }
-    });
+    };
 }

package/lib/chevre/service/order/createAccountingReportIfNotExist.js

@@ -1,31 +1,47 @@
 "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());
-    });
+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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAccountingReportIfNotExist = createAccountingReportIfNotExist;
-const moment = require("moment-timezone");
-const factory = require("../../factory");
+const moment_timezone_1 = __importDefault(require("moment-timezone"));
+const factory = __importStar(require("../../factory"));
 function createAccountingReportIfNotExist(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const order4report = createOrder4report(params);
         const accountingReport = createAccountingReport({
             mainEntity: order4report,
             project: { id: params.project.id }
         });
         // 経理レポートを保管
-        yield repos.accountingReport.syncMainEntity(accountingReport);
-    });
+        await repos.accountingReport.syncMainEntity(accountingReport);
+    };
 }
 // 最適化(2023-06-30~)
 function createOrder4report(params) {
-    var _a;
     if (!Array.isArray(params.acceptedOffers)) {
         throw new factory.errors.ArgumentNull('order.acceptedOffers');
     }
@@ -36,23 +52,34 @@ function createOrder4report(params) {
             if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
                 let itemOffered = o.itemOffered;
                 const reservationFor = itemOffered.reservationFor;
-                itemOffered = Object.assign(Object.assign({}, itemOffered), { reservationFor: Object.assign(Object.assign(Object.assign(Object.assign({}, reservationFor), (typeof reservationFor.doorTime !== undefined)
-                        ? {
-                            doorTime: moment(reservationFor.doorTime)
-                                .toDate()
-                        }
-                        : undefined), (typeof reservationFor.endDate !== undefined)
-                        ? {
-                            endDate: moment(reservationFor.endDate)
-                                .toDate()
-                        }
-                        : undefined), (typeof reservationFor.startDate !== undefined)
-                        ? {
-                            startDate: moment(reservationFor.startDate)
-                                .toDate()
-                        }
-                        : undefined) });
-                return Object.assign(Object.assign({}, o), { itemOffered });
+                itemOffered = {
+                    ...itemOffered,
+                    reservationFor: {
+                        ...reservationFor,
+                        ...(reservationFor.doorTime !== undefined)
+                            ? {
+                                doorTime: (0, moment_timezone_1.default)(reservationFor.doorTime)
+                                    .toDate()
+                            }
+                            : undefined,
+                        ...(reservationFor.endDate !== undefined)
+                            ? {
+                                endDate: (0, moment_timezone_1.default)(reservationFor.endDate)
+                                    .toDate()
+                            }
+                            : undefined,
+                        ...(reservationFor.startDate !== undefined)
+                            ? {
+                                startDate: (0, moment_timezone_1.default)(reservationFor.startDate)
+                                    .toDate()
+                            }
+                            : undefined
+                    }
+                };
+                return {
+                    ...o,
+                    itemOffered
+                };
             }
             else {
                 return o;
@@ -70,18 +97,30 @@ function createOrder4report(params) {
             ? params.customer.identifier
             : []
     };
-    return Object.assign({ 
+    return {
         // ...params,
-        confirmationNumber: params.confirmationNumber, id: params.id, orderNumber: params.orderNumber, orderedItem: params.orderedItem, paymentMethods: params.paymentMethods, price: params.price, priceCurrency: params.priceCurrency, seller: params.seller, typeOf: params.typeOf, customer, orderDate: moment(params.orderDate)
-            .toDate(), acceptedOffers,
-        numItems }, (typeof ((_a = params.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.broker } : undefined
-    // ...(params.dateReturned !== null && params.dateReturned !== undefined)
-    //     ? {
-    //         dateReturned: moment(params.dateReturned)
-    //             .toDate()
-    //     }
-    //     : undefined
-    );
+        confirmationNumber: params.confirmationNumber,
+        id: params.id,
+        orderNumber: params.orderNumber,
+        orderedItem: params.orderedItem,
+        paymentMethods: params.paymentMethods,
+        price: params.price,
+        priceCurrency: params.priceCurrency,
+        seller: params.seller,
+        typeOf: params.typeOf,
+        customer,
+        orderDate: (0, moment_timezone_1.default)(params.orderDate)
+            .toDate(),
+        acceptedOffers,
+        numItems,
+        ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined
+        // ...(params.dateReturned !== null && params.dateReturned !== undefined)
+        //     ? {
+        //         dateReturned: moment(params.dateReturned)
+        //             .toDate()
+        //     }
+        //     : undefined
+    };
 }
 function createAccountingReport(params) {
     return {