@chevre/domain 21.20.0-alpha.9 → 21.20.0

package/lib/chevre/repo/mongoose/schemas/order.d.ts

@@ -1,5 +1,5 @@
 import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
 declare const modelName = "Order";
-declare function createSchema(): Schema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
 export { modelName, indexes, createSchema };

package/lib/chevre/repo/mongoose/schemas/order.js

@@ -60,17 +60,6 @@ const schemaOptions = {
         versionKey: false
     }
 };
-/**
- * 注文スキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-    }
-    return schema;
-}
-exports.createSchema = createSchema;
 const indexes = [
     [
         { createdAt: 1 },
@@ -439,6 +428,24 @@ const indexes = [
             }
         }
     ],
+    [
+        { 'acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber': 1, orderDate: -1 },
+        {
+            name: 'searchByReservedTicketTicketedSeatSeatNumber',
+            partialFilterExpression: {
+                'acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber': { $exists: true }
+            }
+        }
+    ],
+    [
+        { 'acceptedOffers.serialNumber': 1, orderDate: -1 },
+        {
+            name: 'searchByAcceptedOffersSerialNumber',
+            partialFilterExpression: {
+                'acceptedOffers.serialNumber': { $exists: true }
+            }
+        }
+    ],
     [
         { price: 1, orderDate: -1 },
         {
@@ -456,6 +463,26 @@ const indexes = [
                 additionalProperty: { $exists: true }
             }
         }
+    ],
+    [
+        { typeOf: 1, orderDate: -1 },
+        { name: 'searchByTypeOf' }
     ]
 ];
 exports.indexes = indexes;
+/**
+ * 注文スキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

package/lib/chevre/repo/offer.d.ts

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import type { BulkWriteResult } from 'mongodb';
 import { AnyExpression, Connection, PipelineStage } from 'mongoose';
 import * as factory from '../factory';
@@ -189,6 +213,24 @@ export declare class MongoRepository {
             };
         };
     }): Promise<import("mongodb").UpdateResult | undefined>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    addAvailableAtOrFrom(params: {
+        id: string;
+        identifier: string;
+        offers: {
+            availableAtOrFrom: {
+                id: string;
+            };
+        };
+    }): Promise<any>;
+    deleteAvailableAtOrFrom(params: {
+        id: string;
+        offers: {
+            availableAtOrFrom: {
+                id: string;
+            };
+        };
+    }): Promise<any>;
     /**
      * サブカタログから集計オファーIDリストを検索する
      */

package/lib/chevre/repo/offer.js

@@ -1037,6 +1037,41 @@ class MongoRepository {
             return result;
         });
     }
+    getCursor(conditions, projection) {
+        return this.aggregateOfferModel.find(conditions, projection)
+            .sort({ 'offers.identifier': factory.sortType.Ascending })
+            .cursor();
+    }
+    addAvailableAtOrFrom(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.aggregateOfferModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+                $push: {
+                    'offers.$[unitPriceOffer].availableAtOrFrom': {
+                        id: params.offers.availableAtOrFrom.id
+                    }
+                }
+            }, {
+                arrayFilters: [
+                    {
+                        'unitPriceOffer.identifier': { $eq: params.identifier }
+                    }
+                ]
+            })
+                .exec();
+        });
+    }
+    deleteAvailableAtOrFrom(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.aggregateOfferModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+                $pull: {
+                    'offers.$[].availableAtOrFrom': {
+                        id: { $eq: params.offers.availableAtOrFrom.id }
+                    }
+                }
+            })
+                .exec();
+        });
+    }
     /**
      * サブカタログから集計オファーIDリストを検索する
      */

package/lib/chevre/repo/order.js

@@ -23,8 +23,10 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24;
-        const andConditions = [];
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26;
+        const andConditions = [
+            { typeOf: { $eq: factory.order.OrderType.Order } }
+        ];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
@@ -352,7 +354,11 @@ class MongoRepository {
         if (typeof acceptedOffersSize === 'number') {
             andConditions.push({ acceptedOffers: { $size: acceptedOffersSize } });
         }
-        const itemOfferedIdentifierIn = (_v = (_u = (_t = params.acceptedOffers) === null || _t === void 0 ? void 0 : _t.itemOffered) === null || _u === void 0 ? void 0 : _u.identifier) === null || _v === void 0 ? void 0 : _v.$in;
+        const serialNumberEq = (_u = (_t = params.acceptedOffers) === null || _t === void 0 ? void 0 : _t.serialNumber) === null || _u === void 0 ? void 0 : _u.$eq;
+        if (typeof serialNumberEq === 'string') {
+            andConditions.push({ 'acceptedOffers.serialNumber': { $exists: true, $eq: serialNumberEq } });
+        }
+        const itemOfferedIdentifierIn = (_x = (_w = (_v = params.acceptedOffers) === null || _v === void 0 ? void 0 : _v.itemOffered) === null || _w === void 0 ? void 0 : _w.identifier) === null || _x === void 0 ? void 0 : _x.$in;
         if (Array.isArray(itemOfferedIdentifierIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.identifier': {
@@ -361,7 +367,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedTypeOfIn = (_y = (_x = (_w = params.acceptedOffers) === null || _w === void 0 ? void 0 : _w.itemOffered) === null || _x === void 0 ? void 0 : _x.typeOf) === null || _y === void 0 ? void 0 : _y.$in;
+        const itemOfferedTypeOfIn = (_0 = (_z = (_y = params.acceptedOffers) === null || _y === void 0 ? void 0 : _y.itemOffered) === null || _z === void 0 ? void 0 : _z.typeOf) === null || _0 === void 0 ? void 0 : _0.$in;
         if (Array.isArray(itemOfferedTypeOfIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.typeOf': {
@@ -370,7 +376,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIssuedThroughTypeOfEq = (_2 = (_1 = (_0 = (_z = params.acceptedOffers) === null || _z === void 0 ? void 0 : _z.itemOffered) === null || _0 === void 0 ? void 0 : _0.issuedThrough) === null || _1 === void 0 ? void 0 : _1.typeOf) === null || _2 === void 0 ? void 0 : _2.$eq;
+        const itemOfferedIssuedThroughTypeOfEq = (_4 = (_3 = (_2 = (_1 = params.acceptedOffers) === null || _1 === void 0 ? void 0 : _1.itemOffered) === null || _2 === void 0 ? void 0 : _2.issuedThrough) === null || _3 === void 0 ? void 0 : _3.typeOf) === null || _4 === void 0 ? void 0 : _4.$eq;
         if (typeof itemOfferedIssuedThroughTypeOfEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.issuedThrough.typeOf': {
@@ -379,7 +385,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIssuedThroughIdIn = (_6 = (_5 = (_4 = (_3 = params.acceptedOffers) === null || _3 === void 0 ? void 0 : _3.itemOffered) === null || _4 === void 0 ? void 0 : _4.issuedThrough) === null || _5 === void 0 ? void 0 : _5.id) === null || _6 === void 0 ? void 0 : _6.$in;
+        const itemOfferedIssuedThroughIdIn = (_8 = (_7 = (_6 = (_5 = params.acceptedOffers) === null || _5 === void 0 ? void 0 : _5.itemOffered) === null || _6 === void 0 ? void 0 : _6.issuedThrough) === null || _7 === void 0 ? void 0 : _7.id) === null || _8 === void 0 ? void 0 : _8.$in;
         if (Array.isArray(itemOfferedIssuedThroughIdIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.issuedThrough.id': {
@@ -388,7 +394,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedProgramMembershipUsedIdentifierEq = (_10 = (_9 = (_8 = (_7 = params.acceptedOffers) === null || _7 === void 0 ? void 0 : _7.itemOffered) === null || _8 === void 0 ? void 0 : _8.programMembershipUsed) === null || _9 === void 0 ? void 0 : _9.identifier) === null || _10 === void 0 ? void 0 : _10.$eq;
+        const itemOfferedProgramMembershipUsedIdentifierEq = (_12 = (_11 = (_10 = (_9 = params.acceptedOffers) === null || _9 === void 0 ? void 0 : _9.itemOffered) === null || _10 === void 0 ? void 0 : _10.programMembershipUsed) === null || _11 === void 0 ? void 0 : _11.identifier) === null || _12 === void 0 ? void 0 : _12.$eq;
         if (typeof itemOfferedProgramMembershipUsedIdentifierEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.programMembershipUsed.identifier': {
@@ -397,7 +403,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_16 = (_15 = (_14 = (_13 = (_12 = (_11 = params.acceptedOffers) === null || _11 === void 0 ? void 0 : _11.itemOffered) === null || _12 === void 0 ? void 0 : _12.programMembershipUsed) === null || _13 === void 0 ? void 0 : _13.issuedThrough) === null || _14 === void 0 ? void 0 : _14.serviceType) === null || _15 === void 0 ? void 0 : _15.codeValue) === null || _16 === void 0 ? void 0 : _16.$eq;
+        const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_18 = (_17 = (_16 = (_15 = (_14 = (_13 = params.acceptedOffers) === null || _13 === void 0 ? void 0 : _13.itemOffered) === null || _14 === void 0 ? void 0 : _14.programMembershipUsed) === null || _15 === void 0 ? void 0 : _15.issuedThrough) === null || _16 === void 0 ? void 0 : _16.serviceType) === null || _17 === void 0 ? void 0 : _17.codeValue) === null || _18 === void 0 ? void 0 : _18.$eq;
         if (typeof itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.programMembershipUsed.issuedThrough.serviceType.codeValue': {
@@ -559,11 +565,11 @@ class MongoRepository {
                 }
             }
         }
-        const paymentMethodIdentifierIn = (_19 = (_18 = (_17 = params.paymentMethods) === null || _17 === void 0 ? void 0 : _17.paymentMethod) === null || _18 === void 0 ? void 0 : _18.identifier) === null || _19 === void 0 ? void 0 : _19.$in;
+        const paymentMethodIdentifierIn = (_21 = (_20 = (_19 = params.paymentMethods) === null || _19 === void 0 ? void 0 : _19.paymentMethod) === null || _20 === void 0 ? void 0 : _20.identifier) === null || _21 === void 0 ? void 0 : _21.$in;
         if (Array.isArray(paymentMethodIdentifierIn)) {
             andConditions.push({ 'paymentMethods.paymentMethod.identifier': { $exists: true, $in: paymentMethodIdentifierIn } });
         }
-        const paymentMethodsTypeOfIn = (_20 = params.paymentMethods) === null || _20 === void 0 ? void 0 : _20.typeOfs;
+        const paymentMethodsTypeOfIn = (_22 = params.paymentMethods) === null || _22 === void 0 ? void 0 : _22.typeOfs;
         if (Array.isArray(paymentMethodsTypeOfIn)) {
             // paymentMethod.identifierで検索(2023-11-15~)
             // andConditions.push({ 'paymentMethods.typeOf': { $exists: true, $in: paymentMethodsTypeOfIn } });
@@ -593,7 +599,7 @@ class MongoRepository {
                 });
             }
         }
-        const paymentMethodAdditionalPropertyAll = (_22 = (_21 = params.paymentMethods) === null || _21 === void 0 ? void 0 : _21.additionalProperty) === null || _22 === void 0 ? void 0 : _22.$all;
+        const paymentMethodAdditionalPropertyAll = (_24 = (_23 = params.paymentMethods) === null || _23 === void 0 ? void 0 : _23.additionalProperty) === null || _24 === void 0 ? void 0 : _24.$all;
         if (Array.isArray(paymentMethodAdditionalPropertyAll)) {
             andConditions.push({
                 'paymentMethods.additionalProperty': {
@@ -602,7 +608,7 @@ class MongoRepository {
                 }
             });
         }
-        const paymentMethodAdditionalPropertyIn = (_24 = (_23 = params.paymentMethods) === null || _23 === void 0 ? void 0 : _23.additionalProperty) === null || _24 === void 0 ? void 0 : _24.$in;
+        const paymentMethodAdditionalPropertyIn = (_26 = (_25 = params.paymentMethods) === null || _25 === void 0 ? void 0 : _25.additionalProperty) === null || _26 === void 0 ? void 0 : _26.$in;
         if (Array.isArray(paymentMethodAdditionalPropertyIn)) {
             andConditions.push({
                 'paymentMethods.additionalProperty': {
@@ -663,7 +669,13 @@ class MongoRepository {
     createIfNotExist(order) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.orderModel.findOneAndUpdate({ orderNumber: order.orderNumber }, { $setOnInsert: order }, { new: true, upsert: true })
+                // 存在しなければ上書き
+                // updateOneに変更(2024-01-14~)
+                // await this.orderModel.findOneAndUpdate(
+                yield this.orderModel.updateOne({ orderNumber: order.orderNumber }, { $setOnInsert: order }, {
+                    // new: true,
+                    upsert: true
+                })
                     .exec();
             }
             catch (error) {
@@ -688,7 +700,8 @@ class MongoRepository {
             const doc = yield this.orderModel.findOneAndUpdate({
                 orderNumber: { $eq: params.orderNumber },
                 orderStatus: { $eq: params.previousOrderStatus },
-                'project.id': { $eq: params.project.id }
+                'project.id': { $eq: params.project.id },
+                typeOf: { $eq: factory.order.OrderType.Order }
             }, {
                 previousOrderStatus: params.previousOrderStatus,
                 orderStatus: params.orderStatus
@@ -735,7 +748,8 @@ class MongoRepository {
             const doc = yield this.orderModel.findOneAndUpdate({
                 orderNumber: { $eq: params.orderNumber },
                 orderStatus: { $eq: factory.orderStatus.OrderDelivered },
-                'project.id': { $eq: params.project.id }
+                'project.id': { $eq: params.project.id },
+                typeOf: { $eq: factory.order.OrderType.Order }
             }, {
                 previousOrderStatus: factory.orderStatus.OrderDelivered,
                 orderStatus: factory.orderStatus.OrderReturned,
@@ -785,7 +799,8 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.orderModel.findOneAndUpdate({
                 orderNumber: { $eq: params.orderNumber },
-                'project.id': { $eq: params.project.id }
+                'project.id': { $eq: params.project.id },
+                typeOf: { $eq: factory.order.OrderType.Order }
             }, {
                 $set: Object.assign(Object.assign({}, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), (typeof params.name === 'string') ? { name: params.name } : undefined)
             }, {
@@ -810,6 +825,7 @@ class MongoRepository {
             const doc = yield this.orderModel.findOneAndUpdate({
                 orderNumber: { $eq: params.orderNumber },
                 'project.id': { $eq: params.project.id },
+                typeOf: { $eq: factory.order.OrderType.Order },
                 'paymentMethods.paymentMethodId': { $exists: true, $eq: params.invoice.paymentMethodId }
             }, {
                 $set: {
@@ -854,7 +870,10 @@ class MongoRepository {
                     });
                 }
             }
-            const doc = yield this.orderModel.findById({ _id: params.id }, projection)
+            const doc = yield this.orderModel.findOne({
+                _id: params.id,
+                typeOf: { $eq: factory.order.OrderType.Order }
+            }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);
@@ -890,7 +909,8 @@ class MongoRepository {
             }
             const doc = yield this.orderModel.findOne({
                 orderNumber: { $eq: params.orderNumber },
-                'project.id': { $eq: params.project.id }
+                'project.id': { $eq: params.project.id },
+                typeOf: { $eq: factory.order.OrderType.Order }
             }, projection)
                 .exec();
             if (doc === null) {
@@ -908,7 +928,7 @@ class MongoRepository {
                 orderNumber: 1,
                 _id: 0
             };
-            const doc = yield this.orderModel.findOne(Object.assign({ orderNumber: { $eq: params.orderNumber }, 'project.id': { $eq: params.project.id }, acceptedOffers: {
+            const doc = yield this.orderModel.findOne(Object.assign({ orderNumber: { $eq: params.orderNumber }, 'project.id': { $eq: params.project.id }, typeOf: { $eq: factory.order.OrderType.Order }, acceptedOffers: {
                     $elemMatch: {
                         'itemOffered.typeOf': { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] },
                         'itemOffered.id': { $eq: params.reservationId }
@@ -928,7 +948,10 @@ class MongoRepository {
      */
     deleteByOrderNumber(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.orderModel.deleteOne({ orderNumber: params.orderNumber })
+            yield this.orderModel.deleteOne({
+                orderNumber: params.orderNumber,
+                typeOf: { $eq: factory.order.OrderType.Order }
+            })
                 .exec();
         });
     }

package/lib/chevre/repo/orderInTransaction.d.ts

@@ -0,0 +1,44 @@
+import type { Connection } from 'mongoose';
+import * as factory from '../factory';
+type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'> & {
+    typeOf: factory.transactionType.PlaceOrder;
+    acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+};
+/**
+ * 取引中注文リポジトリ
+ */
+export declare class MongoRepository {
+    private readonly orderModel;
+    constructor(connection: Connection);
+    searchByOrderNumber(params: {
+        orderNumber: {
+            $eq: string;
+        };
+    }): Promise<IOrderInTransaction[]>;
+    /**
+     * 注文を受注する
+     */
+    placeOrder(order: Omit<factory.order.IOrder, 'id'> & {
+        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    }, options: {
+        ignoreAccpetedOffersFromResult: boolean;
+    }): Promise<void>;
+    acceptOffer(params: Pick<IOrderInTransaction, 'acceptedOffers' | 'orderNumber' | 'project'>): Promise<import("mongodb").UpdateResult | undefined>;
+    /**
+     * serialNumberからオファーを除外する
+     * ホワイトリストとブラックリスト両方に対応
+     */
+    voidAcceptedOfferBySerialNumber(params: {
+        orderNumber: string;
+        acceptedOffers: {
+            serialNumber: {
+                $in?: string[];
+                $nin?: string[];
+            };
+        };
+    }): Promise<import("mongodb").UpdateResult | undefined>;
+    deleteByOrderNumber(params: {
+        orderNumber: string;
+    }): Promise<import("mongodb").DeleteResult>;
+}
+export {};

package/lib/chevre/repo/orderInTransaction.js

@@ -0,0 +1,164 @@
+"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 __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MongoRepository = void 0;
+const createDebug = require("debug");
+const factory = require("../factory");
+const order_1 = require("./mongoose/schemas/order");
+const debug = createDebug('chevre-domain:repo:orderInTransaction');
+/**
+ * 取引中注文リポジトリ
+ */
+class MongoRepository {
+    constructor(connection) {
+        this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
+    }
+    searchByOrderNumber(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
+            return this.orderModel.find({
+                orderNumber: { $eq: params.orderNumber.$eq },
+                typeOf: { $eq: factory.transactionType.PlaceOrder }
+            })
+                .exec()
+                .then((docs) => docs.map((doc) => doc.toObject()));
+        });
+    }
+    /**
+     * 注文を受注する
+     */
+    placeOrder(order, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let setFields;
+            if (options.ignoreAccpetedOffersFromResult) {
+                // acceptedOffersを上書きしない
+                const { acceptedOffers } = order, orderWithoutAcceptedOffers = __rest(order, ["acceptedOffers"]);
+                setFields = orderWithoutAcceptedOffers;
+            }
+            else {
+                setFields = order;
+            }
+            debug('placing an order...', order.orderNumber, 'setFields:', setFields);
+            // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
+            yield this.orderModel.updateOne({
+                orderNumber: { $eq: order.orderNumber },
+                typeOf: { $eq: factory.transactionType.PlaceOrder }
+            }, { $set: setFields }, {})
+                .exec();
+        });
+    }
+    acceptOffer(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(params.acceptedOffers) || params.acceptedOffers.length === 0) {
+                return;
+            }
+            return this.orderModel.updateOne({
+                typeOf: { $eq: factory.transactionType.PlaceOrder },
+                orderNumber: { $eq: params.orderNumber }
+            }, {
+                $setOnInsert: {
+                    typeOf: factory.transactionType.PlaceOrder,
+                    orderNumber: params.orderNumber,
+                    project: params.project
+                },
+                $push: {
+                    acceptedOffers: {
+                        $each: params.acceptedOffers
+                    }
+                }
+            }, { upsert: true })
+                .exec();
+        });
+    }
+    // 廃止(voidAcceptedOfferBySerialNumberへ機能移行)(2024-01-31~)
+    // public async voidAcceptedOfferByReservationNumber(params: {
+    //     orderNumber: string;
+    //     acceptedOffers: { reservationNumber: { $in: string[] } };
+    // }) {
+    //     return this.orderModel.updateOne(
+    //         {
+    //             typeOf: { $eq: factory.transactionType.PlaceOrder },
+    //             orderNumber: { $eq: params.orderNumber }
+    //         },
+    //         {
+    //             $pull: {
+    //                 acceptedOffers: {
+    //                     'itemOffered.reservationNumber': {
+    //                         $exists: true,
+    //                         $in: params.acceptedOffers.reservationNumber.$in
+    //                     }
+    //                 }
+    //             }
+    //         }
+    //     )
+    //         .exec();
+    // }
+    /**
+     * serialNumberからオファーを除外する
+     * ホワイトリストとブラックリスト両方に対応
+     */
+    voidAcceptedOfferBySerialNumber(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const serialNumberIn = params.acceptedOffers.serialNumber.$in;
+            const serialNumberNin = params.acceptedOffers.serialNumber.$nin;
+            if (Array.isArray(serialNumberIn) && serialNumberIn.length > 0) {
+                return this.orderModel.updateOne({
+                    typeOf: { $eq: factory.transactionType.PlaceOrder },
+                    orderNumber: { $eq: params.orderNumber }
+                }, {
+                    $pull: {
+                        acceptedOffers: {
+                            serialNumber: { $exists: true, $in: serialNumberIn }
+                        }
+                    }
+                })
+                    .exec();
+            }
+            else if (Array.isArray(serialNumberNin) && serialNumberNin.length > 0) {
+                return this.orderModel.updateOne({
+                    typeOf: { $eq: factory.transactionType.PlaceOrder },
+                    orderNumber: { $eq: params.orderNumber }
+                }, {
+                    $pull: {
+                        acceptedOffers: {
+                            serialNumber: { $nin: serialNumberNin }
+                        }
+                    }
+                })
+                    .exec();
+            }
+            else {
+                return;
+            }
+        });
+    }
+    deleteByOrderNumber(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.orderModel.deleteOne({
+                typeOf: { $eq: factory.transactionType.PlaceOrder },
+                orderNumber: { $eq: params.orderNumber }
+            })
+                .exec();
+        });
+    }
+}
+exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/paymentServiceProvider.js

@@ -120,7 +120,8 @@ class MongoRepository {
                                 paymentUrl: {
                                     expiresInSeconds: '$provider.credentials.paymentUrl.expiresInSeconds',
                                     useCallback: '$provider.credentials.paymentUrl.useCallback',
-                                    useWebhook: '$provider.credentials.paymentUrl.useWebhook'
+                                    useWebhook: '$provider.credentials.paymentUrl.useWebhook',
+                                    use3DS: '$provider.credentials.paymentUrl.use3DS'
                                 }
                             }
                         }

package/lib/chevre/repo/person.js

@@ -78,10 +78,7 @@ class CognitoRepository {
         const profile = CognitoRepository.ATTRIBUTE2PROFILE(params);
         const identifier = [];
         if (typeof params.userPoolId === 'string') {
-            identifier.push(
-            // 廃止(2022-12-28~)
-            // { name: 'tokenIssuer', value: `${TOKEN_ISSUER_ENDPOINT}/${params.userPoolId}` },
-            { name: 'iss', value: `${TOKEN_ISSUER_ENDPOINT}/${params.userPoolId}` });
+            identifier.push({ name: 'iss', value: `${TOKEN_ISSUER_ENDPOINT}/${params.userPoolId}` });
         }
         const person = Object.assign(Object.assign({}, profile), { typeOf: factory.personType.Person, id: '', identifier: identifier, memberOf: {
                 membershipNumber: params.username,