@chevre/domain 20.1.0-alpha.4 → 20.1.0-alpha.40

package/lib/chevre/repo/mongoose/model/additionalProperty.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schema = exports.modelName = void 0;
+const mongoose = require("mongoose");
+const modelName = 'AdditionalProperty';
+exports.modelName = modelName;
+const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
+/**
+ * 追加特性スキーマ
+ */
+const schema = new mongoose.Schema({
+    project: mongoose.SchemaTypes.Mixed,
+    typeOf: {
+        type: String,
+        required: true
+    },
+    codeValue: {
+        type: String,
+        required: true
+    },
+    inCodeSet: mongoose.SchemaTypes.Mixed,
+    name: mongoose.SchemaTypes.Mixed
+}, {
+    collection: 'additionalProperties',
+    id: true,
+    read: 'primaryPreferred',
+    writeConcern: writeConcern,
+    strict: true,
+    useNestedStrict: true,
+    timestamps: {
+        createdAt: 'createdAt',
+        updatedAt: 'updatedAt'
+    },
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+});
+exports.schema = schema;
+schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
+schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
+schema.index({ codeValue: 1 }, { name: 'searchByCodeValue' });
+schema.index({ 'project.id': 1, codeValue: 1 }, {
+    name: 'searchByProjectId'
+});
+schema.index({ 'inCodeSet.identifier': 1, codeValue: 1 }, {
+    name: 'searchByInCodeSetIdentifier',
+    partialFilterExpression: {
+        'inCodeSet.identifier': { $exists: true }
+    }
+});
+schema.index({ 'name.ja': 1, codeValue: 1 }, {
+    name: 'searchByNameJa',
+    partialFilterExpression: {
+        'name.ja': { $exists: true }
+    }
+});
+schema.index({ 'name.en': 1, codeValue: 1 }, {
+    name: 'searchByNameEn',
+    partialFilterExpression: {
+        'name.en': { $exists: true }
+    }
+});
+mongoose.model(modelName, schema)
+    .on('index', 
+// tslint:disable-next-line:no-single-line-block-comment
+/* istanbul ignore next */
+(error) => {
+    if (error !== undefined) {
+        // tslint:disable-next-line:no-console
+        console.error(error);
+    }
+});

package/lib/chevre/repo/mongoose/model/categoryCode.js

@@ -13,13 +13,23 @@ const schema = new mongoose.Schema({
     typeOf: {
         type: String,
         required: true
-    }
+    },
+    additionalProperty: [mongoose.SchemaTypes.Mixed],
+    color: String,
+    image: String,
+    codeValue: {
+        type: String,
+        required: true
+    },
+    inCodeSet: mongoose.SchemaTypes.Mixed,
+    name: mongoose.SchemaTypes.Mixed,
+    paymentMethod: mongoose.SchemaTypes.Mixed
 }, {
     collection: 'categoryCodes',
     id: true,
     read: 'primaryPreferred',
     writeConcern: writeConcern,
-    strict: false,
+    strict: true,
     useNestedStrict: true,
     timestamps: {
         createdAt: 'createdAt',
@@ -71,6 +81,12 @@ schema.index({ 'paymentMethod.typeOf': 1, codeValue: 1 }, {
 schema.index({ 'project.id': 1, codeValue: 1 }, {
     name: 'searchByProjectId-v20220721'
 });
+schema.index({ additionalProperty: 1, codeValue: 1 }, {
+    name: 'searchByAdditionalProperty',
+    partialFilterExpression: {
+        additionalProperty: { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/repo/mongoose/model/creativeWork.js

@@ -111,6 +111,12 @@ schema.index({ 'distributor.codeValue': 1, identifier: 1 }, {
         'distributor.codeValue': { $exists: true }
     }
 });
+schema.index({ additionalProperty: 1, identifier: 1 }, {
+    name: 'searchByAdditionalProperty',
+    partialFilterExpression: {
+        additionalProperty: { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/repo/mongoose/model/event.js

@@ -185,6 +185,59 @@ schema.index({
     },
     name: 'searchByOffersItemOfferedId'
 });
+// tslint:disable-next-line:no-suspicious-comment
+// TODO add index
+schema.index({ 'offers.seller.makesOffer': 1, startDate: 1 }, {
+    name: 'searchBySellerMakesOffer',
+    partialFilterExpression: {
+        'offers.seller.makesOffer': { $exists: true }
+    }
+});
+// schema.index(
+//     { 'offers.seller.makesOffer.availableAtOrFrom.id': 1, startDate: 1 },
+//     {
+//         name: 'searchBySellerMakesOfferAvailableAtOrFromId',
+//         partialFilterExpression: {
+//             'offers.seller.makesOffer.availableAtOrFrom.id': { $exists: true }
+//         }
+//     }
+// );
+// schema.index(
+//     { 'offers.seller.makesOffer.availabilityEnds': 1, startDate: 1 },
+//     {
+//         name: 'searchBySellerMakesOfferAvailabilityEnds',
+//         partialFilterExpression: {
+//             'offers.seller.makesOffer.availabilityEnds': { $exists: true }
+//         }
+//     }
+// );
+// schema.index(
+//     { 'offers.seller.makesOffer.availabilityStarts': 1, startDate: 1 },
+//     {
+//         name: 'searchBySellerMakesOfferAvailabilityStarts',
+//         partialFilterExpression: {
+//             'offers.seller.makesOffer.availabilityStarts': { $exists: true }
+//         }
+//     }
+// );
+// schema.index(
+//     { 'offers.seller.makesOffer.validThrough': 1, startDate: 1 },
+//     {
+//         name: 'searchBySellerMakesOfferValidThrough',
+//         partialFilterExpression: {
+//             'offers.seller.makesOffer.validThrough': { $exists: true }
+//         }
+//     }
+// );
+// schema.index(
+//     { 'offers.seller.makesOffer.validFrom': 1, startDate: 1 },
+//     {
+//         name: 'searchBySellerMakesOfferValidFrom',
+//         partialFilterExpression: {
+//             'offers.seller.makesOffer.validFrom': { $exists: true }
+//         }
+//     }
+// );
 schema.index({ 'videoFormat.typeOf': 1, startDate: 1 }, {
     name: 'searchByVideoFormatTypeOf',
     partialFilterExpression: {

package/lib/chevre/repo/mongoose/model/offer.js

@@ -19,7 +19,7 @@ const schema = new mongoose.Schema({
     description: mongoose.SchemaTypes.Mixed,
     category: mongoose.SchemaTypes.Mixed,
     color: mongoose.SchemaTypes.Mixed,
-    additionalProperty: mongoose.SchemaTypes.Mixed,
+    additionalProperty: [mongoose.SchemaTypes.Mixed],
     alternateName: mongoose.SchemaTypes.Mixed,
     acceptedPaymentMethod: mongoose.SchemaTypes.Mixed,
     addOn: mongoose.SchemaTypes.Mixed,
@@ -189,6 +189,12 @@ schema.index({ 'hasMerchantReturnPolicy.id': 1, 'priceSpecification.price': 1 },
         'hasMerchantReturnPolicy.id': { $exists: true }
     }
 });
+schema.index({ additionalProperty: 1, 'priceSpecification.price': 1 }, {
+    name: 'searchByAdditionalProperty',
+    partialFilterExpression: {
+        additionalProperty: { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/repo/mongoose/model/offerCatalog.js

@@ -11,13 +11,26 @@ const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
 const schema = new mongoose.Schema({
     project: mongoose.SchemaTypes.Mixed,
     _id: String,
-    identifier: mongoose.SchemaTypes.Mixed
+    identifier: {
+        type: String,
+        required: true
+    },
+    name: mongoose.SchemaTypes.Mixed,
+    description: mongoose.SchemaTypes.Mixed,
+    alternateName: mongoose.SchemaTypes.Mixed,
+    typeOf: {
+        type: String,
+        required: true
+    },
+    itemListElement: [mongoose.SchemaTypes.Mixed],
+    itemOffered: mongoose.SchemaTypes.Mixed,
+    additionalProperty: [mongoose.SchemaTypes.Mixed]
 }, {
     collection: 'offerCatalogs',
     id: true,
     read: 'primaryPreferred',
     writeConcern: writeConcern,
-    strict: false,
+    strict: true,
     timestamps: {
         createdAt: 'createdAt',
         updatedAt: 'updatedAt'
@@ -62,6 +75,12 @@ schema.index({ 'itemOffered.serviceType.codeValue': 1, identifier: 1 }, {
         'itemOffered.serviceType.codeValue': { $exists: true }
     }
 });
+schema.index({ additionalProperty: 1, identifier: 1 }, {
+    name: 'searchByAdditionalProperty',
+    partialFilterExpression: {
+        additionalProperty: { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/repo/mongoose/model/ownershipInfo.js

@@ -5,18 +5,6 @@ const mongoose = require("mongoose");
 const modelName = 'OwnershipInfo';
 exports.modelName = modelName;
 const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
-// Arrayにも対応するためにMixedに変更(2022-07-26~)
-const ownedBySchema = mongoose.SchemaTypes.Mixed;
-const acquiredFromSchema = new mongoose.Schema({}, {
-    id: false,
-    _id: false,
-    strict: false
-});
-const typeOfGoodSchema = new mongoose.Schema({}, {
-    id: false,
-    _id: false,
-    strict: false
-});
 /**
  * 所有権スキーマ
  */
@@ -28,11 +16,11 @@ const schema = new mongoose.Schema({
         required: true
     },
     identifier: mongoose.SchemaTypes.Mixed,
-    ownedBy: ownedBySchema,
-    acquiredFrom: acquiredFromSchema,
+    ownedBy: mongoose.SchemaTypes.Mixed,
+    acquiredFrom: mongoose.SchemaTypes.Mixed,
     ownedFrom: Date,
     ownedThrough: Date,
-    typeOfGood: typeOfGoodSchema
+    typeOfGood: mongoose.SchemaTypes.Mixed
 }, {
     collection: 'ownershipInfos',
     id: true,

package/lib/chevre/repo/mongoose/model/place.js

@@ -89,6 +89,48 @@ schema.index({ 'parentOrganization.id': 1, branchCode: 1 }, {
         'parentOrganization.id': { $exists: true }
     }
 });
+schema.index({ 'containsPlace.branchCode': 1, branchCode: 1 }, {
+    name: 'searchByContainsPlaceBranchCode',
+    partialFilterExpression: {
+        'containsPlace.branchCode': { $exists: true }
+    }
+});
+schema.index({ 'containsPlace.containsPlace.branchCode': 1, branchCode: 1 }, {
+    name: 'searchByContainsPlaceContainsPlaceBranchCode',
+    partialFilterExpression: {
+        'containsPlace.containsPlace.branchCode': { $exists: true }
+    }
+});
+schema.index({ 'containsPlace.containsPlace.containsPlace.branchCode': 1, branchCode: 1 }, {
+    name: 'searchByContainsPlaceContainsPlaceContainsPlaceBranchCode',
+    partialFilterExpression: {
+        'containsPlace.containsPlace.containsPlace.branchCode': { $exists: true }
+    }
+});
+schema.index({ additionalProperty: 1, branchCode: 1 }, {
+    name: 'searchByAdditionalProperty',
+    partialFilterExpression: {
+        additionalProperty: { $exists: true }
+    }
+});
+schema.index({ 'containsPlace.additionalProperty': 1, branchCode: 1 }, {
+    name: 'searchByContainsPlaceAdditionalProperty',
+    partialFilterExpression: {
+        'containsPlace.additionalProperty': { $exists: true }
+    }
+});
+schema.index({ 'containsPlace.containsPlace.additionalProperty': 1, branchCode: 1 }, {
+    name: 'searchByContainsPlaceContainsPlaceAdditionalProperty',
+    partialFilterExpression: {
+        'containsPlace.containsPlace.additionalProperty': { $exists: true }
+    }
+});
+schema.index({ 'containsPlace.containsPlace.containsPlace.additionalProperty': 1, branchCode: 1 }, {
+    name: 'searchByContainsPlaceContainsPlaceContainsPlaceAdditionalProperty',
+    partialFilterExpression: {
+        'containsPlace.containsPlace.containsPlace.additionalProperty': { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/repo/offer.js

@@ -35,7 +35,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_OFFER_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;
+        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;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -285,6 +285,15 @@ class MongoRepository {
                 }
             });
         }
+        const additionalPropertyElemMatch = (_24 = params.additionalProperty) === null || _24 === void 0 ? void 0 : _24.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            andConditions.push({
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: additionalPropertyElemMatch
+                }
+            });
+        }
         return andConditions;
     }
     /**

package/lib/chevre/repo/offerCatalog.js

@@ -32,7 +32,7 @@ class MongoRepository {
         this.offerCatalogModel = connection.model(offerCatalog_1.modelName);
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -107,15 +107,15 @@ class MongoRepository {
                 }
             });
         }
-        // 互換性対応
-        // const ticketTypes = params.ticketTypes;
-        // if (Array.isArray(ticketTypes)) {
-        //     andConditions.push({
-        //         ticketTypes: {
-        //             $in: ticketTypes
-        //         }
-        //     });
-        // }
+        const additionalPropertyElemMatch = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            andConditions.push({
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: additionalPropertyElemMatch
+                }
+            });
+        }
         return andConditions;
     }
     save(params) {

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

@@ -114,5 +114,6 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
+    getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
 }
 export {};

package/lib/chevre/repo/place.js

@@ -33,7 +33,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -123,6 +123,15 @@ class MongoRepository {
                 }
             });
         }
+        const additionalPropertyElemMatch = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            andConditions.push({
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: additionalPropertyElemMatch
+                }
+            });
+        }
         return andConditions;
     }
     /**
@@ -426,7 +435,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     searchScreeningRoomSections(searchConditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [];
             if (searchConditions.project !== undefined) {
@@ -508,6 +517,17 @@ class MongoRepository {
                     }
                 });
             }
+            const additionalPropertyElemMatch = (_j = searchConditions.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+            if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+                matchStages.push({
+                    $match: {
+                        'containsPlace.containsPlace.additionalProperty': {
+                            $exists: true,
+                            $elemMatch: additionalPropertyElemMatch
+                        }
+                    }
+                });
+            }
             const aggregate = this.placeModel.aggregate([
                 { $unwind: '$containsPlace' },
                 { $unwind: '$containsPlace.containsPlace' },
@@ -523,7 +543,7 @@ class MongoRepository {
                                 branchCode: '$branchCode',
                                 name: '$name'
                             }
-                        }, additionalProperty: '$containsPlace.containsPlace.additionalProperty' }, (((_j = searchConditions.$projection) === null || _j === void 0 ? void 0 : _j.seatCount) === 1)
+                        }, additionalProperty: '$containsPlace.containsPlace.additionalProperty' }, (((_k = searchConditions.$projection) === null || _k === void 0 ? void 0 : _k.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $cond: {
@@ -573,7 +593,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     searchScreeningRooms(searchConditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [];
             const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -662,6 +682,17 @@ class MongoRepository {
                     }
                 });
             }
+            const additionalPropertyElemMatch = (_g = searchConditions.additionalProperty) === null || _g === void 0 ? void 0 : _g.$elemMatch;
+            if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+                matchStages.push({
+                    $match: {
+                        'containsPlace.additionalProperty': {
+                            $exists: true,
+                            $elemMatch: additionalPropertyElemMatch
+                        }
+                    }
+                });
+            }
             const aggregate = this.placeModel.aggregate([
                 { $unwind: '$containsPlace' },
                 ...matchStages,
@@ -671,7 +702,7 @@ class MongoRepository {
                             typeOf: '$typeOf',
                             branchCode: '$branchCode',
                             name: '$name'
-                        }, openSeatingAllowed: '$containsPlace.openSeatingAllowed', additionalProperty: '$containsPlace.additionalProperty' }, (((_g = searchConditions.$projection) === null || _g === void 0 ? void 0 : _g.sectionCount) === 1)
+                        }, openSeatingAllowed: '$containsPlace.openSeatingAllowed', additionalProperty: '$containsPlace.additionalProperty' }, (((_h = searchConditions.$projection) === null || _h === void 0 ? void 0 : _h.sectionCount) === 1)
                         ? {
                             sectionCount: {
                                 $cond: {
@@ -681,7 +712,7 @@ class MongoRepository {
                                 }
                             }
                         }
-                        : undefined), (((_h = searchConditions.$projection) === null || _h === void 0 ? void 0 : _h.seatCount) === 1)
+                        : undefined), (((_j = searchConditions.$projection) === null || _j === void 0 ? void 0 : _j.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $sum: {
@@ -824,7 +855,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchSeats(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [];
             if (params.project !== undefined) {
@@ -962,6 +993,17 @@ class MongoRepository {
                 && params.$projection['containedInPlace.containedInPlace'] === 0) {
                 includeScreeningRooms = false;
             }
+            const additionalPropertyElemMatch = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+            if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+                matchStages.push({
+                    $match: {
+                        'containsPlace.containsPlace.containsPlace.additionalProperty': {
+                            $exists: true,
+                            $elemMatch: additionalPropertyElemMatch
+                        }
+                    }
+                });
+            }
             const aggregate = this.placeModel.aggregate([
                 { $unwind: '$containsPlace' },
                 { $unwind: '$containsPlace.containsPlace' },
@@ -1036,5 +1078,10 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.placeModel.find(conditions, projection)
+            .sort({ branchCode: factory.sortType.Ascending })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -35,6 +35,11 @@ export declare class MongoRepository {
         underName?: factory.reservation.IUnderName<T>;
         reservedTicket?: factory.reservation.ITicket;
     }): Promise<factory.reservation.IReservation<T>>;
+    confirmByReservationNumber(params: {
+        reservationNumber: string;
+        previousReservationStatus: factory.reservationStatusType;
+        underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    }): Promise<void>;
     /**
      * 予約取消
      */
@@ -43,6 +48,14 @@ export declare class MongoRepository {
         previousReservationStatus?: factory.reservationStatusType;
         now: Date;
     }): Promise<factory.reservation.IReservation<T>>;
+    /**
+     * 予約取消
+     */
+    cancelByReservationNumber(params: {
+        reservationNumber: string;
+        previousReservationStatus?: factory.reservationStatusType;
+        now: Date;
+    }): Promise<void>;
     /**
      * 発券する
      */

package/lib/chevre/repo/reservation.js

@@ -911,6 +911,19 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    confirmByReservationNumber(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = {
+                reservationNumber: { $eq: String(params.reservationNumber) },
+                reservationStatus: { $eq: params.previousReservationStatus }
+            };
+            const update = Object.assign({ reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }, (params.underName !== undefined) ? { underName: params.underName } : undefined
+            // ...(params.reservedTicket !== undefined) ? { reservedTicket: params.reservedTicket } : undefined
+            );
+            yield this.reservationModel.updateMany(conditions, update)
+                .exec();
+        });
+    }
     /**
      * 予約取消
      */
@@ -939,6 +952,21 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    /**
+     * 予約取消
+     */
+    cancelByReservationNumber(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = Object.assign({ reservationNumber: { $eq: String(params.reservationNumber) } }, (typeof params.previousReservationStatus === 'string')
+                ? { reservationStatus: params.previousReservationStatus }
+                : undefined);
+            const update = Object.assign(Object.assign({}, (typeof params.previousReservationStatus === 'string')
+                ? { previousReservationStatus: params.previousReservationStatus }
+                : undefined), { reservationStatus: factory.reservationStatusType.ReservationCancelled, modifiedTime: params.now });
+            yield this.reservationModel.updateMany(conditions, update)
+                .exec();
+        });
+    }
     /**
      * 発券する
      */

package/lib/chevre/repo/transaction.js

@@ -247,7 +247,24 @@ class MongoRepository {
      */
     start(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.create(Object.assign(Object.assign({ typeOf: params.typeOf }, params), { status: factory.transactionStatusType.InProgress, startDate: new Date(), endDate: undefined, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
+            const startDate = new Date();
+            let expires;
+            if (params.typeOf === factory.transactionType.PlaceOrder
+                || params.typeOf === factory.transactionType.ReturnOrder) {
+                // expiresInSecondsの指定があれば優先して適用する(2022-11-25~)
+                if (typeof params.expiresInSeconds === 'number' && params.expiresInSeconds > 0) {
+                    expires = moment(startDate)
+                        .add(params.expiresInSeconds, 'seconds')
+                        .toDate();
+                }
+                else {
+                    throw new factory.errors.ArgumentNull('expiresInSeconds');
+                }
+            }
+            else {
+                expires = params.expires;
+            }
+            return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate, endDate: undefined, expires, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
                 .then((doc) => doc.toObject());
         });
     }
@@ -433,8 +450,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.transactionModel.findByIdAndUpdate(params.id, {
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
-                tasksExportedAt: moment()
-                    .toDate()
+                tasksExportedAt: new Date()
             })
                 .exec();
         });
@@ -460,8 +476,7 @@ class MongoRepository {
      */
     cancel(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const endDate = moment()
-                .toDate();
+            const endDate = new Date();
             // 進行中ステータスの取引を中止する
             const doc = yield this.transactionModel.findOneAndUpdate({
                 typeOf: params.typeOf,