@chevre/domain 24.1.0-alpha.3 → 24.1.0-alpha.30

package/lib/chevre/repo/order.js

@@ -31,27 +31,27 @@ class OrderRepo {
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        /* istanbul ignore else */
-        if (params.identifier !== undefined) {
-            /* istanbul ignore else */
-            if (Array.isArray(params.identifier.$all)) {
-                andConditions.push({
-                    identifier: {
-                        $exists: true,
-                        $all: params.identifier.$all
-                    }
-                });
-            }
-            /* istanbul ignore else */
-            if (Array.isArray(params.identifier.$in)) {
-                andConditions.push({
-                    identifier: {
-                        $exists: true,
-                        $in: params.identifier.$in
-                    }
-                });
-            }
-        }
+        // /* istanbul ignore else */
+        // if (params.identifier !== undefined) {
+        //     /* istanbul ignore else */
+        //     if (Array.isArray(params.identifier.$all)) {
+        //         andConditions.push({
+        //             identifier: {
+        //                 $exists: true,
+        //                 $all: params.identifier.$all
+        //             }
+        //         });
+        //     }
+        //     /* istanbul ignore else */
+        //     if (Array.isArray(params.identifier.$in)) {
+        //         andConditions.push({
+        //             identifier: {
+        //                 $exists: true,
+        //                 $in: params.identifier.$in
+        //             }
+        //         });
+        //     }
+        // }
         const providerIdEq = params.provider?.id?.$eq;
         if (typeof providerIdEq === 'string') {
             andConditions.push({ 'seller.id': { $exists: true, $eq: providerIdEq } });
@@ -129,44 +129,44 @@ class OrderRepo {
                     });
                 }
             }
-            if (params.customer.additionalProperty !== undefined && params.customer.additionalProperty !== null) {
-                if (Array.isArray(params.customer.additionalProperty.$all)) {
-                    andConditions.push({
-                        'customer.additionalProperty': {
-                            $exists: true,
-                            $all: params.customer.additionalProperty.$all
-                        }
-                    });
-                }
-                if (Array.isArray(params.customer.additionalProperty.$in)) {
-                    andConditions.push({
-                        'customer.additionalProperty': {
-                            $exists: true,
-                            $in: params.customer.additionalProperty.$in
-                        }
-                    });
-                }
-            }
-            if (params.customer.memberOf !== undefined && params.customer.memberOf !== null) {
-                if (params.customer.memberOf.membershipNumber !== undefined && params.customer.memberOf.membershipNumber !== null) {
-                    if (typeof params.customer.memberOf.membershipNumber.$eq === 'string') {
-                        andConditions.push({
-                            'customer.memberOf.membershipNumber': {
-                                $exists: true,
-                                $eq: params.customer.memberOf.membershipNumber.$eq
-                            }
-                        });
-                    }
-                    if (Array.isArray(params.customer.memberOf.membershipNumber.$in)) {
-                        andConditions.push({
-                            'customer.memberOf.membershipNumber': {
-                                $exists: true,
-                                $in: params.customer.memberOf.membershipNumber.$in
-                            }
-                        });
-                    }
-                }
-            }
+            // if (params.customer.additionalProperty !== undefined && params.customer.additionalProperty !== null) {
+            //     if (Array.isArray(params.customer.additionalProperty.$all)) {
+            //         andConditions.push({
+            //             'customer.additionalProperty': {
+            //                 $exists: true,
+            //                 $all: params.customer.additionalProperty.$all
+            //             }
+            //         });
+            //     }
+            //     if (Array.isArray(params.customer.additionalProperty.$in)) {
+            //         andConditions.push({
+            //             'customer.additionalProperty': {
+            //                 $exists: true,
+            //                 $in: params.customer.additionalProperty.$in
+            //             }
+            //         });
+            //     }
+            // }
+            // if (params.customer.memberOf !== undefined && params.customer.memberOf !== null) {
+            //     if (params.customer.memberOf.membershipNumber !== undefined && params.customer.memberOf.membershipNumber !== null) {
+            //         if (typeof params.customer.memberOf.membershipNumber.$eq === 'string') {
+            //             andConditions.push({
+            //                 'customer.memberOf.membershipNumber': {
+            //                     $exists: true,
+            //                     $eq: params.customer.memberOf.membershipNumber.$eq
+            //                 }
+            //             });
+            //         }
+            //         if (Array.isArray(params.customer.memberOf.membershipNumber.$in)) {
+            //             andConditions.push({
+            //                 'customer.memberOf.membershipNumber': {
+            //                     $exists: true,
+            //                     $in: params.customer.memberOf.membershipNumber.$in
+            //                 }
+            //             });
+            //         }
+            //     }
+            // }
             if (typeof params.customer.givenName === 'string') {
                 if (params.customer.givenName.length > 0) {
                     andConditions.push({
@@ -325,72 +325,73 @@ class OrderRepo {
                 andConditions.push({ confirmationNumber: { $exists: true, $in: params.confirmationNumbers } });
             }
         }
-        const orderedItemSize = params.orderedItem?.$size;
-        if (typeof orderedItemSize === 'number') {
-            andConditions.push({ orderedItem: { $size: orderedItemSize } });
-        }
-        const acceptedOffersSize = params.acceptedOffers?.$size;
-        if (typeof acceptedOffersSize === 'number') {
-            andConditions.push({ acceptedOffers: { $size: acceptedOffersSize } });
-        }
+        // const orderedItemSize = params.orderedItem?.$size;
+        // if (typeof orderedItemSize === 'number') {
+        //     andConditions.push({ orderedItem: { $size: orderedItemSize } });
+        // }
+        // const acceptedOffersSize = params.acceptedOffers?.$size;
+        // if (typeof acceptedOffersSize === 'number') {
+        //     andConditions.push({ acceptedOffers: { $size: acceptedOffersSize } });
+        // }
         const serialNumberEq = params.acceptedOffers?.serialNumber?.$eq;
         if (typeof serialNumberEq === 'string') {
             andConditions.push({ 'acceptedOffers.serialNumber': { $exists: true, $eq: serialNumberEq } });
         }
-        const itemOfferedIdentifierIn = params.acceptedOffers?.itemOffered?.identifier?.$in;
-        if (Array.isArray(itemOfferedIdentifierIn)) {
-            andConditions.push({
-                'acceptedOffers.itemOffered.identifier': {
-                    $exists: true,
-                    $in: itemOfferedIdentifierIn
-                }
-            });
-        }
-        const itemOfferedTypeOfIn = params.acceptedOffers?.itemOffered?.typeOf?.$in;
-        if (Array.isArray(itemOfferedTypeOfIn)) {
-            andConditions.push({
-                'acceptedOffers.itemOffered.typeOf': {
-                    $exists: true,
-                    $in: itemOfferedTypeOfIn
-                }
-            });
-        }
-        const itemOfferedIssuedThroughTypeOfEq = params.acceptedOffers?.itemOffered?.issuedThrough?.typeOf?.$eq;
-        if (typeof itemOfferedIssuedThroughTypeOfEq === 'string') {
-            andConditions.push({
-                'acceptedOffers.itemOffered.issuedThrough.typeOf': {
-                    $exists: true,
-                    $eq: itemOfferedIssuedThroughTypeOfEq
-                }
-            });
-        }
-        const itemOfferedIssuedThroughIdIn = params.acceptedOffers?.itemOffered?.issuedThrough?.id?.$in;
-        if (Array.isArray(itemOfferedIssuedThroughIdIn)) {
-            andConditions.push({
-                'acceptedOffers.itemOffered.issuedThrough.id': {
-                    $exists: true,
-                    $in: itemOfferedIssuedThroughIdIn
-                }
-            });
-        }
-        const itemOfferedProgramMembershipUsedIdentifierEq = params.acceptedOffers?.itemOffered?.programMembershipUsed?.identifier?.$eq;
-        if (typeof itemOfferedProgramMembershipUsedIdentifierEq === 'string') {
-            andConditions.push({
-                'acceptedOffers.itemOffered.programMembershipUsed.identifier': {
-                    $exists: true,
-                    $eq: itemOfferedProgramMembershipUsedIdentifierEq
-                }
-            });
-        }
-        const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq = params.acceptedOffers?.itemOffered?.programMembershipUsed?.issuedThrough?.serviceType?.codeValue?.$eq;
-        if (typeof itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
-            andConditions.push({
-                'acceptedOffers.itemOffered.programMembershipUsed.issuedThrough.serviceType.codeValue': {
-                    $exists: true,
-                    $eq: itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq
-                }
-            });
-        }
+        // const itemOfferedIdentifierIn = params.acceptedOffers?.itemOffered?.identifier?.$in;
+        // if (Array.isArray(itemOfferedIdentifierIn)) {
+        //     andConditions.push({
+        //         'acceptedOffers.itemOffered.identifier': {
+        //             $exists: true,
+        //             $in: itemOfferedIdentifierIn
+        //         }
+        //     });
+        // }
+        // const itemOfferedTypeOfIn = params.acceptedOffers?.itemOffered?.typeOf?.$in;
+        // if (Array.isArray(itemOfferedTypeOfIn)) {
+        //     andConditions.push({
+        //         'acceptedOffers.itemOffered.typeOf': {
+        //             $exists: true,
+        //             $in: itemOfferedTypeOfIn
+        //         }
+        //     });
+        // }
+        // const itemOfferedIssuedThroughTypeOfEq = params.acceptedOffers?.itemOffered?.issuedThrough?.typeOf?.$eq;
+        // if (typeof itemOfferedIssuedThroughTypeOfEq === 'string') {
+        //     andConditions.push({
+        //         'acceptedOffers.itemOffered.issuedThrough.typeOf': {
+        //             $exists: true,
+        //             $eq: itemOfferedIssuedThroughTypeOfEq
+        //         }
+        //     });
+        // }
+        // const itemOfferedIssuedThroughIdIn = params.acceptedOffers?.itemOffered?.issuedThrough?.id?.$in;
+        // if (Array.isArray(itemOfferedIssuedThroughIdIn)) {
+        //     andConditions.push({
+        //         'acceptedOffers.itemOffered.issuedThrough.id': {
+        //             $exists: true,
+        //             $in: itemOfferedIssuedThroughIdIn
+        //         }
+        //     });
+        // }
+        // const itemOfferedProgramMembershipUsedIdentifierEq = params.acceptedOffers?.itemOffered?.programMembershipUsed?.identifier?.$eq;
+        // if (typeof itemOfferedProgramMembershipUsedIdentifierEq === 'string') {
+        //     andConditions.push({
+        //         'acceptedOffers.itemOffered.programMembershipUsed.identifier': {
+        //             $exists: true,
+        //             $eq: itemOfferedProgramMembershipUsedIdentifierEq
+        //         }
+        //     });
+        // }
+        // const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq =
+        //     params.acceptedOffers?.itemOffered?.programMembershipUsed?.issuedThrough?.serviceType?.codeValue?.$eq;
+        // if (typeof itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
+        //     andConditions.push({
+        //         'acceptedOffers.itemOffered.programMembershipUsed.issuedThrough.serviceType.codeValue': {
+        //             $exists: true,
+        //             $eq: itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq
+        //         }
+        //     });
+        // }
         const itemOfferedReservedTicketIdentifierEq = params.acceptedOffers?.itemOffered?.reservedTicket?.identifier?.$eq;
         if (typeof itemOfferedReservedTicketIdentifierEq === 'string') {
             andConditions.push({
@@ -434,25 +435,25 @@ class OrderRepo {
                             }
                         });
                     }
-                    /* istanbul ignore else */
-                    if (typeof reservationForConditions.name === 'string' && reservationForConditions.name.length > 0) {
-                        andConditions.push({
-                            $or: [
-                                {
-                                    'acceptedOffers.itemOffered.reservationFor.name.ja': {
-                                        $exists: true,
-                                        $regex: new RegExp(reservationForConditions.name)
-                                    }
-                                },
-                                {
-                                    'acceptedOffers.itemOffered.reservationFor.name.en': {
-                                        $exists: true,
-                                        $regex: new RegExp(reservationForConditions.name)
-                                    }
-                                }
-                            ]
-                        });
-                    }
+                    // /* istanbul ignore else */
+                    // if (typeof reservationForConditions.name === 'string' && reservationForConditions.name.length > 0) {
+                    //     andConditions.push({
+                    //         $or: [
+                    //             {
+                    //                 'acceptedOffers.itemOffered.reservationFor.name.ja': {
+                    //                     $exists: true,
+                    //                     $regex: new RegExp(reservationForConditions.name)
+                    //                 }
+                    //             },
+                    //             {
+                    //                 'acceptedOffers.itemOffered.reservationFor.name.en': {
+                    //                     $exists: true,
+                    //                     $regex: new RegExp(reservationForConditions.name)
+                    //                 }
+                    //             }
+                    //         ]
+                    //     });
+                    // }
                     /* istanbul ignore else */
                     if (reservationForConditions.location !== undefined) {
                         if (Array.isArray(reservationForConditions.location.branchCodes)) {
@@ -608,18 +609,18 @@ class OrderRepo {
                 }
             });
         }
-        /* istanbul ignore else */
-        if (params.orderDateFrom instanceof Date) {
-            andConditions.push({
-                orderDate: { $gte: params.orderDateFrom }
-            });
-        }
-        /* istanbul ignore else */
-        if (params.orderDateThrough instanceof Date) {
-            andConditions.push({
-                orderDate: { $lte: params.orderDateThrough }
-            });
-        }
+        // /* istanbul ignore else */
+        // if (params.orderDateFrom instanceof Date) {
+        //     andConditions.push({
+        //         orderDate: { $gte: params.orderDateFrom }
+        //     });
+        // }
+        // /* istanbul ignore else */
+        // if (params.orderDateThrough instanceof Date) {
+        //     andConditions.push({
+        //         orderDate: { $lte: params.orderDateThrough }
+        //     });
+        // }
         if (params.orderDate !== undefined && params.orderDate !== null) {
             if (params.orderDate.$gte instanceof Date) {
                 andConditions.push({
@@ -632,24 +633,24 @@ class OrderRepo {
                 });
             }
         }
-        if (params.price !== undefined && params.price !== null) {
-            if (typeof params.price.$gte === 'number') {
-                andConditions.push({
-                    price: {
-                        $exists: true,
-                        $gte: params.price.$gte
-                    }
-                });
-            }
-            if (typeof params.price.$lte === 'number') {
-                andConditions.push({
-                    price: {
-                        $exists: true,
-                        $lte: params.price.$lte
-                    }
-                });
-            }
-        }
+        // if (params.price !== undefined && params.price !== null) {
+        //     if (typeof params.price.$gte === 'number') {
+        //         andConditions.push({
+        //             price: {
+        //                 $exists: true,
+        //                 $gte: params.price.$gte
+        //             }
+        //         });
+        //     }
+        //     if (typeof params.price.$lte === 'number') {
+        //         andConditions.push({
+        //             price: {
+        //                 $exists: true,
+        //                 $lte: params.price.$lte
+        //             }
+        //         });
+        //     }
+        // }
         return andConditions;
     }
     /**
@@ -1071,199 +1072,5 @@ class OrderRepo {
         }
         return { aggregation: aggregations[0] };
     }
-    async aggregateOrderOfSeat(params) {
-        const seatNumber = params.acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber;
-        const screenCode = params.acceptedOffers.itemOffered.reservationFor.location.branchCode;
-        const movieTheaterCode = params.acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode;
-        const customerEmailIn = params.customer?.email?.$in;
-        const matchConditions = {
-            orderDate: {
-                $gte: params.orderDate.$gte,
-                $lte: params.orderDate.$lte
-            },
-            typeOf: { $eq: factory_1.factory.order.OrderType.Order },
-            'project.id': { $eq: params.project.id.$eq },
-            'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode': { $exists: true, $eq: movieTheaterCode },
-            'acceptedOffers.itemOffered.reservationFor.location.branchCode': { $exists: true, $eq: screenCode },
-            'acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber': { $exists: true, $eq: seatNumber },
-            ...(Array.isArray(customerEmailIn))
-                ? { 'customer.email': { $exists: true, $in: customerEmailIn } }
-                : undefined
-        };
-        const aggregations4email = await this.orderModel.aggregate([
-            { $match: matchConditions },
-            {
-                $group: {
-                    _id: '$customer.email'
-                }
-            },
-            {
-                $count: 'emailCount'
-            }
-        ])
-            .exec();
-        const emailCount = (aggregations4email.length > 0) ? aggregations4email[0].emailCount : 0;
-        const aggregations = await this.orderModel.aggregate([
-            { $match: matchConditions },
-            {
-                $project: {
-                    typeOf: '$typeOf',
-                    graceTime: {
-                        $subtract: [
-                            { $first: '$acceptedOffers.itemOffered.reservationFor.startDate' },
-                            '$orderDate'
-                        ]
-                    }
-                }
-            },
-            {
-                $group: {
-                    _id: '$typeOf',
-                    orderCount: { $sum: 1 },
-                    sumGraceTime: { $sum: '$graceTime' }
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    orderCount: '$orderCount',
-                    sumGraceTime: '$sumGraceTime'
-                }
-            }
-        ])
-            .exec();
-        if (aggregations.length === 0) {
-            return {
-                aggregation: {
-                    orderCount: 0
-                }
-            };
-        }
-        return {
-            aggregation: {
-                ...aggregations[0],
-                emailCount
-            }
-        };
-    }
-    async aggregateOrderOfCustomerByProject(params) {
-        const matchConditions = {
-            orderDate: {
-                $gte: params.orderDate.$gte,
-                $lte: params.orderDate.$lte
-            },
-            typeOf: { $eq: factory_1.factory.order.OrderType.Order },
-            ...(typeof params.project?.id.$eq === 'string') ? { 'project.id': { $eq: params.project.id.$eq } } : undefined,
-            'customer.email': { $exists: true, $eq: params.customer.email.$eq }
-        };
-        const aggregations = await this.orderModel.aggregate([
-            { $match: matchConditions },
-            {
-                $project: {
-                    typeOf: '$typeOf',
-                    graceTime: {
-                        $subtract: [
-                            { $first: '$acceptedOffers.itemOffered.reservationFor.startDate' },
-                            '$orderDate'
-                        ]
-                    }
-                }
-            },
-            {
-                $group: {
-                    _id: '$typeOf',
-                    orderCount: { $sum: 1 },
-                    sumGraceTime: { $sum: '$graceTime' }
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    orderCount: '$orderCount',
-                    sumGraceTime: '$sumGraceTime'
-                }
-            }
-        ])
-            .exec();
-        if (aggregations.length === 0) {
-            return {
-                aggregation: {
-                    orderCount: 0
-                }
-            };
-        }
-        return {
-            aggregation: {
-                ...aggregations[0]
-            }
-        };
-    }
-    async aggregateOrderOfCustomerGlobally(params) {
-        const matchConditions = {
-            orderDate: {
-                $gte: params.orderDate.$gte,
-                $lte: params.orderDate.$lte
-            },
-            typeOf: { $eq: factory_1.factory.order.OrderType.Order },
-            'customer.email': { $exists: true, $eq: params.customer.email.$eq }
-        };
-        const aggregations = await this.orderModel.aggregate([
-            { $match: matchConditions },
-            {
-                $project: {
-                    typeOf: '$typeOf'
-                }
-            },
-            {
-                $group: {
-                    _id: '$typeOf',
-                    orderCount: { $sum: 1 }
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    orderCount: '$orderCount'
-                }
-            }
-        ])
-            .exec();
-        if (aggregations.length === 0) {
-            return {
-                aggregation: {
-                    orderCount: 0,
-                    aggregateProject: { projectCount: 0 }
-                }
-            };
-        }
-        const aggregations2 = await this.orderModel.aggregate([
-            { $match: matchConditions },
-            {
-                $project: {
-                    project: '$project'
-                }
-            },
-            {
-                $group: {
-                    _id: '$project.id'
-                }
-            },
-            {
-                $count: 'projectCount'
-            },
-            {
-                $project: {
-                    aggregateProject: { projectCount: '$projectCount' }
-                }
-            }
-        ])
-            .exec();
-        return {
-            aggregation: {
-                ...aggregations[0],
-                ...aggregations2[0]
-            }
-        };
-    }
 }
 exports.OrderRepo = OrderRepo;

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

@@ -1,21 +1,49 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../factory';
+import { AcceptedOfferInReserveRepo } from './acceptedOfferInReserve';
 type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'> & {
     typeOf: factory.transactionType.PlaceOrder;
     orderDate: Date;
     acceptedOffers: factory.order.IAcceptedOffer[];
     customer?: factory.order.ICustomer;
 };
+type IAcceptedOffer = factory.order.IAcceptedOffer & {
+    /**
+     * 受け入れ時に指定必須
+     */
+    offeredThrough: factory.offer.IOfferedThrough;
+};
+/**
+ * typeOf: Orderへドキュメント変換時の編集フィールド
+ */
 export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationNumber' | 'identifier' | 'isGift' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf' | 'url'> & {
+    /**
+     * 上書きしてはいけない
+     */
     acceptedOffers?: never;
+    /**
+     * 上書きしてはいけない
+     */
     customer?: never;
 };
 /**
  * 取引中注文リポジトリ
  */
-export declare class OrderInTransactionRepo {
+export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     private readonly orderModel;
     constructor(connection: Connection);
+    /**
+     * 取引進行中の注文からacceptedOffersを検索する
+     * 予約取引から予約ごとの価格仕様も参照する
+     */
+    findAcceptedOffersWithPriceByOrderNumber(params: {
+        orderNumber: string;
+        project: {
+            id: string;
+        };
+    }): Promise<(Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+        priceSpecification?: factory.order.ITicketPriceSpecification;
+    })[]>;
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      */
@@ -23,16 +51,24 @@ export declare class OrderInTransactionRepo {
         orderNumber: {
             $eq: string;
         };
-    }): Promise<factory.order.IAcceptedOffer[]>;
+    }): Promise<Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'serialNumber'>[]>;
     /**
      * 注文を受注する
+     * typeOf: PlaceOrder -> typeOf: Order
      */
     placeOrder(order: IPlacingOrder): Promise<void>;
     /**
      * 注文documentがなければ作成し、受け入れられたオファーを追加する
      * このメソッドでdocumentが初めて生成される(typeOf:PlaceOrderとして)
      */
-    acceptOffer(params: Pick<IOrderInTransaction, 'acceptedOffers' | 'orderNumber' | 'project'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
+    acceptOffer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project'> & {
+        acceptedOffers: (Omit<IAcceptedOffer, 'priceSpecification'> & {
+            /**
+             * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+             */
+            priceSpecification?: factory.order.ITicketPriceSpecification;
+        })[];
+    }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
      * serialNumberからオファーを除外する
      * ホワイトリストとブラックリスト両方に対応