@chevre/domain 21.22.0 → 21.23.0-alpha.1

package/example/src/chevre/findReservationByCode.ts

@@ -0,0 +1,34 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const acceptedOfferRepo = await chevre.repository.AcceptedOffer.createInstance(mongoose.connection);
+    const authorizationRepo = await chevre.repository.Code.createInstance(mongoose.connection);
+    const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
+
+    const result = await (await chevre.service.reserve.createService()).findByCode({
+        project: { id: project.id },
+        code: '068cb0ba-8529-4a2b-8cf5-890d5af9c536',
+        id: '589701779538948-0'
+    })({
+        acceptedOffer: acceptedOfferRepo,
+        authorization: authorizationRepo,
+        reservation: reservationRepo
+    });
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(result, { depth: null });
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/migrateDeleteTransactionTasks.ts

@@ -20,11 +20,11 @@ async function main() {
             runsAt: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(175, 'days')
+                    .add(223, 'days')
                     .toDate(),
                 $lte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(200, 'days')
+                    .add(300, 'days')
                     .toDate()
             }
             // _id: { $eq: '64aba5f37b8b8ef9eca60be5' }

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

@@ -48,8 +48,11 @@ export declare class MongoRepository {
          */
         acceptedOffers?: {
             itemOffered?: {
+                id?: {
+                    $eq?: string;
+                };
                 typeOf?: {
-                    $in?: string[];
+                    $in?: factory.order.IItemOffered['typeOf'][];
                 };
                 reservationFor?: {
                     id?: {

package/lib/chevre/repo/acceptedOffer.js

@@ -85,20 +85,24 @@ class MongoRepository {
      * 注文オファーを展開して検索する
      */
     searchAcceptedOffersByOrderNumber(filter, inclusion) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [
                 { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
                 { $match: { 'project.id': { $eq: filter.project.id.$eq } } },
                 { $match: { typeOf: { $eq: factory.order.OrderType.Order } } }
             ];
-            const itemOfferedTypeOfIn = (_c = (_b = (_a = filter.acceptedOffers) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.typeOf) === null || _c === void 0 ? void 0 : _c.$in;
+            const itemOfferedIdEq = (_c = (_b = (_a = filter.acceptedOffers) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.$eq;
+            if (typeof itemOfferedIdEq === 'string') {
+                matchStages.push({ $match: { 'acceptedOffers.itemOffered.id': { $exists: true, $eq: itemOfferedIdEq } } });
+            }
+            const itemOfferedTypeOfIn = (_f = (_e = (_d = filter.acceptedOffers) === null || _d === void 0 ? void 0 : _d.itemOffered) === null || _e === void 0 ? void 0 : _e.typeOf) === null || _f === void 0 ? void 0 : _f.$in;
             if (Array.isArray(itemOfferedTypeOfIn)) {
                 matchStages.push({
                     $match: { 'acceptedOffers.itemOffered.typeOf': { $exists: true, $in: itemOfferedTypeOfIn } }
                 });
             }
-            const resevationForIdIn = (_g = (_f = (_e = (_d = filter.acceptedOffers) === null || _d === void 0 ? void 0 : _d.itemOffered) === null || _e === void 0 ? void 0 : _e.reservationFor) === null || _f === void 0 ? void 0 : _f.id) === null || _g === void 0 ? void 0 : _g.$in;
+            const resevationForIdIn = (_k = (_j = (_h = (_g = filter.acceptedOffers) === null || _g === void 0 ? void 0 : _g.itemOffered) === null || _h === void 0 ? void 0 : _h.reservationFor) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$in;
             if (Array.isArray(resevationForIdIn)) {
                 matchStages.push({
                     $match: {
@@ -106,7 +110,7 @@ class MongoRepository {
                     }
                 });
             }
-            const ticketedSeatNumberIn = (_m = (_l = (_k = (_j = (_h = filter.acceptedOffers) === null || _h === void 0 ? void 0 : _h.itemOffered) === null || _j === void 0 ? void 0 : _j.reservedTicket) === null || _k === void 0 ? void 0 : _k.ticketedSeat) === null || _l === void 0 ? void 0 : _l.seatNumber) === null || _m === void 0 ? void 0 : _m.$in;
+            const ticketedSeatNumberIn = (_q = (_p = (_o = (_m = (_l = filter.acceptedOffers) === null || _l === void 0 ? void 0 : _l.itemOffered) === null || _m === void 0 ? void 0 : _m.reservedTicket) === null || _o === void 0 ? void 0 : _o.ticketedSeat) === null || _p === void 0 ? void 0 : _p.seatNumber) === null || _q === void 0 ? void 0 : _q.$in;
             if (Array.isArray(ticketedSeatNumberIn)) {
                 matchStages.push({
                     $match: {

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

@@ -1,4 +1,4 @@
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import { modelName } from './mongoose/schemas/authorization';
 export type IObject = factory.authorization.IObject;
@@ -10,7 +10,7 @@ export { modelName };
 export declare class MongoRepository {
     private readonly authorizationModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.authorization.ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.authorization.ISearchConditions): FilterQuery<factory.authorization.IAuthorization>[];
     /**
      * コードを発行する
      */

package/lib/chevre/repo/code.js

@@ -25,33 +25,27 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         const andConditions = [];
         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
-                }
-            });
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.id !== undefined) {
-            if (Array.isArray(params.id.$in)) {
-                andConditions.push({
-                    _id: { $in: params.id.$in }
-                });
-            }
+        const idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.code !== undefined) {
-            if (Array.isArray(params.code.$in)) {
-                andConditions.push({
-                    code: { $exists: true, $in: params.code.$in }
-                });
-            }
+        const idIn = (_d = params.id) === null || _d === void 0 ? void 0 : _d.$in;
+        if (Array.isArray(idIn)) {
+            andConditions.push({ _id: { $in: idIn } });
+        }
+        const codeEq = (_e = params.code) === null || _e === void 0 ? void 0 : _e.$eq;
+        if (typeof codeEq === 'string') {
+            andConditions.push({ code: { $eq: codeEq } });
+        }
+        const codeIn = (_f = params.code) === null || _f === void 0 ? void 0 : _f.$in;
+        if (Array.isArray(codeIn)) {
+            andConditions.push({ code: { $in: codeIn } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -102,26 +96,16 @@ class MongoRepository {
                 }
             }
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (Array.isArray(params.codes)) {
-            andConditions.push({
-                code: { $exists: true, $in: params.codes }
-            });
-        }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
+        // if (Array.isArray(params.codes)) {
+        //     andConditions.push({
+        //         code: { $exists: true, $in: params.codes }
+        //     });
+        // }
         if (params.validFrom instanceof Date) {
-            andConditions.push({
-                validUntil: { $exists: true, $gte: params.validFrom }
-            });
+            andConditions.push({ validUntil: { $exists: true, $gte: params.validFrom } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (params.validThrough instanceof Date) {
-            andConditions.push({
-                validFrom: { $lte: params.validThrough }
-            });
+            andConditions.push({ validFrom: { $lte: params.validThrough } });
         }
         return andConditions;
     }
@@ -150,21 +134,10 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const now = new Date();
             const doc = yield this.authorizationModel.findOne({
-                'project.id': {
-                    $eq: params.project.id
-                },
-                code: {
-                    $exists: true,
-                    $eq: params.code
-                },
-                validFrom: {
-                    $exists: true,
-                    $lte: now
-                },
-                validUntil: {
-                    $exists: true,
-                    $gte: now
-                }
+                'project.id': { $eq: params.project.id },
+                code: { $eq: String(params.code) },
+                validFrom: { $lte: now },
+                validUntil: { $exists: true, $gte: now }
             })
                 .exec();
             if (doc === null) {

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

@@ -1,5 +1,5 @@
 import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
 declare const modelName = "Authorization";
-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/authorization.js

@@ -8,10 +8,19 @@ const modelName = 'Authorization';
 exports.modelName = modelName;
 const schemaDefinition = {
     project: mongoose_1.SchemaTypes.Mixed,
-    typeOf: String,
-    code: String,
+    typeOf: {
+        type: String,
+        required: true
+    },
+    code: {
+        type: String,
+        required: true
+    },
     object: mongoose_1.SchemaTypes.Mixed,
-    validFrom: Date,
+    validFrom: {
+        type: Date,
+        required: true
+    },
     validUntil: Date
 };
 const schemaOptions = {
@@ -40,17 +49,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 },
@@ -74,27 +72,15 @@ const indexes = [
     ],
     [
         { 'project.id': 1, validFrom: 1 },
-        {
-            name: 'searchByProjectId-v20220721'
-        }
+        { name: 'searchByProjectId-v20220721' }
     ],
     [
         { typeOf: 1, validFrom: 1 },
-        {
-            name: 'searchByTypeOf',
-            partialFilterExpression: {
-                typeOf: { $exists: true }
-            }
-        }
+        { name: 'searchByTypeOf-v2' }
     ],
     [
         { code: 1, validFrom: 1 },
-        {
-            name: 'searchByCode',
-            partialFilterExpression: {
-                code: { $exists: true }
-            }
-        }
+        { name: 'searchByCode-v2' }
     ],
     [
         { validUntil: 1, validFrom: 1 },
@@ -143,3 +129,19 @@ const indexes = [
     ]
 ];
 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/order.js

@@ -949,7 +949,7 @@ class MongoRepository {
     deleteByOrderNumber(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.orderModel.deleteOne({
-                orderNumber: params.orderNumber,
+                orderNumber: { $eq: params.orderNumber },
                 typeOf: { $eq: factory.order.OrderType.Order }
             })
                 .exec();

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

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection, UpdateWriteOpResult } from 'mongoose';
+import type { Connection, FilterQuery, UpdateWriteOpResult } from 'mongoose';
 import * as factory from '../factory';
 export interface IUpdatePartiallyParams {
     additionalTicketText?: string;
@@ -34,13 +34,14 @@ export type ICreatingReservation<T extends factory.reservationType> = T extends
 } : T extends factory.reservationType.EventReservation ? (factory.reservation.eventReservation.IReservation) & {
     _id: string;
 } : never;
+type IKeyOfProjection = keyof factory.reservation.IReservation<factory.reservationType.BusReservation | factory.reservationType.EventReservation> | '_id';
 /**
  * 予約リポジトリ
  */
 export declare class MongoRepository {
     private readonly reservationModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.reservation.ISearchConditions<factory.reservationType>): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.reservation.ISearchConditions<factory.reservationType>): FilterQuery<import("@chevre/factory/lib/reservation/busReservation").IReservation | import("@chevre/factory/lib/reservation/event").IReservation | import("@chevre/factory/lib/reservation/reservationPackage").IReservation>[];
     /**
      * 汎用予約カウント
      */
@@ -49,7 +50,7 @@ export declare class MongoRepository {
      * 予約検索
      */
     search<T extends factory.reservationType>(params: factory.reservation.ISearchConditions<T>, projection?: {
-        [key: string]: 0 | 1;
+        [key in IKeyOfProjection]?: 0 | 1;
     }): Promise<factory.reservation.IReservation<factory.reservationType.EventReservation>[]>;
     findById<T extends factory.reservationType>(params: {
         id: string;
@@ -144,3 +145,4 @@ export declare class MongoRepository {
     deleteReservedTicketUnderName(): Promise<import("mongodb").UpdateResult>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }
+export {};

package/lib/chevre/repo/reservation.js

@@ -25,7 +25,7 @@ class MongoRepository {
         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;
         // MongoDB検索条件
         const andConditions = [
-            { typeOf: params.typeOf }
+            { typeOf: { $eq: params.typeOf } }
         ];
         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') {
@@ -38,42 +38,22 @@ class MongoRepository {
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (Array.isArray(params.ids)) {
-            andConditions.push({
-                _id: {
-                    $in: params.ids
-                }
-            });
+            andConditions.push({ _id: { $in: params.ids } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.id !== undefined && params.id !== null) {
             if (typeof params.id.$eq === 'string') {
-                andConditions.push({
-                    _id: {
-                        $eq: params.id.$eq
-                    }
-                });
+                andConditions.push({ _id: { $eq: params.id.$eq } });
             }
             if (typeof params.id.$ne === 'string') {
-                andConditions.push({
-                    _id: {
-                        $ne: params.id.$ne
-                    }
-                });
+                andConditions.push({ _id: { $ne: params.id.$ne } });
             }
             if (Array.isArray(params.id.$in)) {
-                andConditions.push({
-                    _id: {
-                        $in: params.id.$in
-                    }
-                });
+                andConditions.push({ _id: { $in: params.id.$in } });
             }
             if (Array.isArray(params.id.$nin)) {
-                andConditions.push({
-                    _id: {
-                        $nin: params.id.$nin
-                    }
-                });
+                andConditions.push({ _id: { $nin: params.id.$nin } });
             }
         }
         // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/service/code.js

@@ -25,7 +25,7 @@ function getToken(params) {
         const authorizations = yield repos.authorization.search({
             limit: 1,
             project: { id: { $eq: params.project.id } },
-            code: { $in: [params.code] },
+            code: { $eq: String(params.code) },
             validFrom: now,
             validThrough: now
         });

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

@@ -62,14 +62,12 @@ function deleteReservationsByOrder(order) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
-            project: { id: { $eq: order.project.id } }
-        });
-        const reservationIds = acceptedOffers.filter((o) => {
-            return o.itemOffered.typeOf === factory.reservationType.EventReservation;
-        })
-            .map((o) => {
-            return o.itemOffered.id;
+            project: { id: { $eq: order.project.id } },
+            acceptedOffers: {
+                itemOffered: { typeOf: { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] } }
+            }
         });
+        const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));
         if (reservationIds.length > 0) {
             yield repos.reservation.deleteByIds({ project: { id: order.project.id }, ids: reservationIds });
         }

package/lib/chevre/service/payment/creditCard.js

@@ -538,8 +538,9 @@ function processChangeTransaction(params) {
                 if (error.name === 'GMOServiceBadRequestError') {
                     // 会員が存在しない場合このエラーになる
                     if (Array.isArray(error.errors) && error.errors.length === 1 && error.errors[0].info === 'E01050004') {
-                        if (searchTradeResult.status === GMO.utils.util.Status.Authenticated) {
-                            debug('status:', searchTradeResult.status, 'nothing to do');
+                        debug('creditCardService.alterTran:E01050004:', 'orderId:', searchTradeResult.orderId, 'status:', searchTradeResult.status);
+                        if (searchTradeResult.status === GMO.utils.util.Status.Authenticated
+                            || searchTradeResult.status === GMO.utils.util.Status.Void) {
                             throwsError = false;
                         }
                     }

package/lib/chevre/service/reserve/findByCode.d.ts

@@ -0,0 +1,30 @@
+import * as factory from '../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
+import type { MongoRepository as AuthorizationRepo } from '../../repo/code';
+import type { MongoRepository as ReservationRepo } from '../../repo/reservation';
+type AvailableReservationType = factory.reservationType.BusReservation | factory.reservationType.EventReservation;
+type IReservationResult = Pick<factory.reservation.IReservation<AvailableReservationType>, 'id' | 'additionalTicketText' | 'reservationStatus'> & {
+    reservedTicket: {
+        ticketType: Pick<factory.reservation.ITicketType<AvailableReservationType>, 'identifier' | 'name'>;
+    };
+};
+declare function findByCode(params: {
+    /**
+     * 予約ID
+     */
+    id: string;
+    project: {
+        id: string;
+    };
+    /**
+     * 注文コード
+     */
+    code: string;
+}): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
+    authorization: AuthorizationRepo;
+    reservation: ReservationRepo;
+}) => Promise<{
+    reservation: IReservationResult;
+}>;
+export { findByCode };

package/lib/chevre/service/reserve/findByCode.js

@@ -0,0 +1,91 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findByCode = void 0;
+const factory = require("../../factory");
+function findByCode(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        if (typeof params.id !== 'string' || params.id.length === 0) {
+            throw new factory.errors.ArgumentNull('id');
+        }
+        if (typeof params.code !== 'string' || params.code.length === 0) {
+            throw new factory.errors.ArgumentNull('code');
+        }
+        const now = new Date();
+        const authorization = (yield repos.authorization.search({
+            limit: 1,
+            project: { id: { $eq: params.project.id } },
+            code: { $eq: params.code },
+            validFrom: now,
+            validThrough: now
+        })).shift();
+        if (authorization === undefined) {
+            throw new factory.errors.NotFound('Authorization');
+        }
+        let reservationIdInOrder;
+        let reservationTypeInOrder;
+        let offeredThroughIdentifier = factory.service.webAPI.Identifier.Chevre;
+        const data = authorization.object;
+        switch (data.typeOf) {
+            case factory.order.OrderType.Order:
+                const { orderNumber } = data;
+                const acceptedOffer = (yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    orderNumber: { $eq: String(orderNumber) },
+                    acceptedOffers: { itemOffered: { id: { $eq: String(params.id) } } }
+                }, ['itemOffered', 'offeredThrough'])).shift();
+                const itemOfferedTypeOf = acceptedOffer === null || acceptedOffer === void 0 ? void 0 : acceptedOffer.itemOffered.typeOf;
+                if (itemOfferedTypeOf === factory.reservationType.BusReservation
+                    || itemOfferedTypeOf === factory.reservationType.EventReservation) {
+                    reservationIdInOrder = acceptedOffer === null || acceptedOffer === void 0 ? void 0 : acceptedOffer.itemOffered.id;
+                    reservationTypeInOrder = itemOfferedTypeOf;
+                    offeredThroughIdentifier = (_a = acceptedOffer === null || acceptedOffer === void 0 ? void 0 : acceptedOffer.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier;
+                }
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`authorization object typeOf: ${data.typeOf} not implemented`);
+        }
+        let reservation;
+        if (typeof reservationIdInOrder === 'string' && typeof reservationTypeInOrder === 'string') {
+            switch (offeredThroughIdentifier) {
+                // COA対応
+                case factory.service.webAPI.Identifier.COA:
+                    throw new factory.errors.NotImplemented(`offeredThroughIdentifier: ${offeredThroughIdentifier} not implemented`);
+                default:
+                    const reservationFromRepo = (yield repos.reservation.search({
+                        project: { id: { $eq: params.project.id } },
+                        typeOf: reservationTypeInOrder,
+                        id: { $eq: reservationIdInOrder }
+                    }, { id: 1, additionalTicketText: 1, reservationStatus: 1, reservedTicket: 1 })).shift();
+                    if (reservationFromRepo !== undefined) {
+                        const { id, additionalTicketText, reservationStatus, reservedTicket } = reservationFromRepo;
+                        reservation = {
+                            id, additionalTicketText, reservationStatus,
+                            reservedTicket: {
+                                ticketType: {
+                                    identifier: reservedTicket === null || reservedTicket === void 0 ? void 0 : reservedTicket.ticketType.identifier,
+                                    name: { ja: (_b = reservedTicket === null || reservedTicket === void 0 ? void 0 : reservedTicket.ticketType.name) === null || _b === void 0 ? void 0 : _b.ja }
+                                }
+                            }
+                        };
+                    }
+            }
+        }
+        if (reservation === undefined) {
+            throw new factory.errors.NotFound('Reservation');
+        }
+        return { reservation };
+    });
+}
+exports.findByCode = findByCode;

package/lib/chevre/service/reserve/searchByOrder.d.ts

@@ -6,7 +6,7 @@ type IReservationResult = Pick<factory.reservation.IReservation<factory.reservat
 declare function searchByOrder(params: {
     limit: number;
     page: number;
-    typeOf: factory.reservationType;
+    typeOf: factory.reservationType.BusReservation | factory.reservationType.EventReservation;
     project: {
         id: string;
     };

package/lib/chevre/service/reserve.d.ts

@@ -5,7 +5,8 @@ import { maskUnderName } from './reserve/factory';
 import { cancelPendingReservation, cancelReservation } from './reserve/cancelReservation';
 import { checkInReservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
+import { findByCode } from './reserve/findByCode';
 import { searchByOrder } from './reserve/searchByOrder';
 import { useReservation } from './reserve/useReservation';
 import { verifyToken4reservation } from './reserve/verifyToken4reservation';
-export { maskUnderName, cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, searchByOrder, useReservation, verifyToken4reservation };
+export { maskUnderName, cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, searchByOrder, useReservation, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken4reservation = exports.useReservation = exports.searchByOrder = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
+exports.verifyToken4reservation = exports.useReservation = exports.searchByOrder = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
 /**
  * 予約サービス
  */
@@ -13,6 +13,8 @@ const checkInReservation_1 = require("./reserve/checkInReservation");
 Object.defineProperty(exports, "checkInReservation", { enumerable: true, get: function () { return checkInReservation_1.checkInReservation; } });
 const confirmReservation_1 = require("./reserve/confirmReservation");
 Object.defineProperty(exports, "confirmReservation", { enumerable: true, get: function () { return confirmReservation_1.confirmReservation; } });
+const findByCode_1 = require("./reserve/findByCode");
+Object.defineProperty(exports, "findByCode", { enumerable: true, get: function () { return findByCode_1.findByCode; } });
 const searchByOrder_1 = require("./reserve/searchByOrder");
 Object.defineProperty(exports, "searchByOrder", { enumerable: true, get: function () { return searchByOrder_1.searchByOrder; } });
 const useReservation_1 = require("./reserve/useReservation");

package/lib/chevre/service/transaction/deleteTransaction.js

@@ -149,13 +149,16 @@ function deleteTransactionById(params) {
             && params.object.specifyingMethod !== factory.task.deleteTransaction.SpecifyingMethod.Id) {
             throw new factory.errors.Argument('object.specifyingMethod', `must be ${factory.task.deleteTransaction.SpecifyingMethod.Id}`);
         }
-        const transactions = yield repos.transaction.search({
-            ids: [params.object.id],
+        const deletingTransactionId = params.object.id;
+        if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
+            throw new factory.errors.ArgumentNull('object.id');
+        }
+        const transaction = (yield repos.transaction.search({
+            ids: [deletingTransactionId],
             typeOf: params.object.typeOf,
-            inclusion: [],
+            inclusion: ['typeOf', 'project', 'status', 'result'],
             exclusion: []
-        });
-        const transaction = transactions.shift();
+        })).shift();
         if (transaction === undefined) {
             // すでに削除済
             return;
@@ -183,7 +186,7 @@ function deleteTransactionById(params) {
                     const authorizeActions = yield repos.action.searchByPurpose({
                         typeOf: factory.actionType.AuthorizeAction,
                         purpose: {
-                            typeOf: transaction.typeOf,
+                            typeOf: transactionTypeOf,
                             id: transaction.id
                         }
                     });
@@ -200,6 +203,7 @@ function deleteTransactionById(params) {
                             }
                             break;
                         default:
+                            throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
                     }
                     // tslint:disable-next-line:no-suspicious-comment
                     // TODO サービス登録取引を削除
@@ -216,10 +220,11 @@ function deleteTransactionById(params) {
                     // アクション削除(2023-05-19~)
                     deleteActionResult = yield repos.action.deleteByPurpose({
                         project: { id: transaction.project.id },
-                        purpose: { id: transaction.id, typeOf: transaction.typeOf },
+                        purpose: { id: transaction.id, typeOf: transactionTypeOf },
                         typeOf: {
                             $in: [
                                 factory.actionType.AuthorizeAction,
+                                factory.actionType.CheckAction,
                                 factory.actionType.InformAction,
                                 factory.actionType.OrderAction
                             ]
@@ -343,7 +348,7 @@ function deletePayTransactionsByPlaceOrder(params) {
             if (refundTransactions.length > 0) {
                 const deleteRefundAssetTransactionsResult = yield repos.assetTransaction.deleteByTransactionNumber({
                     project: { id: params.transaction.project.id },
-                    transactionNumbers: refundTransactions.map((refundTransaction) => refundTransaction.transactionNumber),
+                    transactionNumbers: refundTransactions.map(({ transactionNumber }) => transactionNumber),
                     typeOf: factory.assetTransactionType.Refund
                 });
                 deleteRefundResult = {

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.355.0-alpha.1",
-    "@cinerino/sdk": "5.12.0-alpha.0",
+    "@chevre/factory": "4.356.0",
+    "@cinerino/sdk": "5.12.0-alpha.2",
     "@motionpicture/coa-service": "9.3.0-alpha.5",
     "@motionpicture/gmo-service": "5.3.0-alpha.4",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.22.0"
+  "version": "21.23.0-alpha.1"
 }