@chevre/domain 21.2.0-alpha.60 → 21.2.0-alpha.62

package/example/src/chevre/deleteTasksByName.ts

@@ -1,4 +1,5 @@
 // tslint:disable:no-console
+import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
@@ -6,13 +7,19 @@ import { chevre } from '../../../lib/index';
 // const project = { id: String(process.env.PROJECT_ID) };
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const taskRepo = new chevre.repository.Task(mongoose.connection);
 
     const result = await taskRepo.deleteByName({
-        name: chevre.factory.taskName.DeleteOrder,
+        name: chevre.factory.taskName.DeleteAssetTransaction,
         status: { $eq: chevre.factory.taskStatus.Ready }
+        // runsAt: {
+        //     $gte: moment('2023-05-20T00:00:00Z')
+        //         .toDate(),
+        //     $lte: moment('2023-12-20T00:00:00Z')
+        //         .toDate()
+        // }
     });
 
     console.log('deleted', result);

package/example/src/chevre/searchReservationNumbersByOrderNumbers.ts

@@ -10,11 +10,11 @@ async function main() {
 
     const orderRepo = new chevre.repository.Order(mongoose.connection);
 
-    const reservationNumbers = await orderRepo.searchReservationNumbersByOrderNumbers({
-        orderNumber: { $in: ['CIN5-8118459-9364668', 'CIN7-9119652-8987979', 'SSK1-3992448-6733563'] }
+    const reservatioForIds = await orderRepo.searchReservationForIdsByOrderNumbers({
+        orderNumber: { $in: ['TTT9-4703865-8892744', 'TTT9-4703865-8398074', 'SSK9-4703865-4744524'] }
     });
-    console.log('reservationNumbers found', reservationNumbers);
-    console.log(reservationNumbers.length, 'reservationNumbers found');
+    console.log('reservatioForIds found', reservatioForIds);
+    console.log(reservatioForIds.length, 'reservatioForIds found');
 }
 
 main()

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

@@ -55,19 +55,19 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     typeOf?: string | undefined;
     project?: any;
     identifier?: string | undefined;
-    itemOfferded?: any;
+    itemOffered?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     name?: any;
     typeOf?: string | undefined;
     project?: any;
     identifier?: string | undefined;
-    itemOfferded?: any;
+    itemOffered?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     name?: any;
     typeOf?: string | undefined;
     project?: any;
     identifier?: string | undefined;
-    itemOfferded?: any;
+    itemOffered?: any;
 }> & {
     _id: import("mongoose").Types.ObjectId;
 }, never>>;

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

@@ -13,7 +13,7 @@ const schema = new mongoose_1.Schema({
     identifier: String,
     typeOf: String,
     name: mongoose_1.SchemaTypes.Mixed,
-    itemOfferded: mongoose_1.SchemaTypes.Mixed
+    itemOffered: mongoose_1.SchemaTypes.Mixed
 }, {
     collection: 'offerItemConditions',
     id: true,

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

@@ -3,35 +3,18 @@ import * as factory from '../factory';
 interface IProjection {
     [key: string]: 0 | 1;
 }
-interface IOfferItemCondition {
-    id?: string;
-    identifier: string;
-    itemOfferded: {
-        typeOf: factory.product.ProductType.EventService;
-        serviceOutput?: {
-            typeOf: factory.reservationType.EventReservation;
-            reservationFor: any;
-        };
-    };
-    name: factory.multilingualString;
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    typeOf: 'OfferItemCondition';
-}
 /**
  * アイテムコンディションリポジトリ
  */
 export declare class MongoRepository {
     private readonly offerItemConditionModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: any): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.offerItemCondition.ISearchConditions): any[];
     findById(params: {
         id: string;
-    }): Promise<IOfferItemCondition>;
-    search(params: any, projection?: IProjection): Promise<IOfferItemCondition[]>;
-    save(params: IOfferItemCondition): Promise<IOfferItemCondition>;
+    }): Promise<factory.offerItemCondition.IOfferItemCondition>;
+    search(params: factory.offerItemCondition.ISearchConditions, projection?: IProjection): Promise<factory.offerItemCondition.IOfferItemCondition[]>;
+    save(params: factory.offerItemCondition.IOfferItemCondition): Promise<factory.offerItemCondition.IOfferItemCondition>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/offerItemCondition.js

@@ -31,17 +31,25 @@ class MongoRepository {
         this.offerItemConditionModel = connection.model(offerItemCondition_1.modelName, offerItemCondition_1.schema);
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d;
+        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 } });
         }
-        const identifierEq = (_c = params.identifier) === null || _c === void 0 ? void 0 : _c.$eq;
+        const idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
+        }
+        const idIn = (_d = params.id) === null || _d === void 0 ? void 0 : _d.$in;
+        if (Array.isArray(idIn)) {
+            andConditions.push({ _id: { $in: idIn } });
+        }
+        const identifierEq = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$eq;
         if (typeof identifierEq === 'string') {
             andConditions.push({ identifier: { $eq: identifierEq } });
         }
-        const identifierIn = (_d = params.identifier) === null || _d === void 0 ? void 0 : _d.$in;
+        const identifierIn = (_f = params.identifier) === null || _f === void 0 ? void 0 : _f.$in;
         if (Array.isArray(identifierIn)) {
             andConditions.push({ identifier: { $in: identifierIn } });
         }

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

@@ -110,5 +110,13 @@ export declare class MongoRepository {
             $in: string[];
         };
     }): Promise<(string)[]>;
+    /**
+     * 注文に含まれるイベントIDを検索する
+     */
+    searchReservationForIdsByOrderNumbers(params: {
+        orderNumber: {
+            $in: string[];
+        };
+    }): Promise<string[]>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }

package/lib/chevre/repo/order.js

@@ -1010,6 +1010,22 @@ class MongoRepository {
             return [...new Set(reservationNumbers)];
         });
     }
+    /**
+     * 注文に含まれるイベントIDを検索する
+     */
+    searchReservationForIdsByOrderNumbers(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
+                return [];
+            }
+            return this.orderModel.distinct('acceptedOffers.itemOffered.reservationFor.id', {
+                'acceptedOffers.itemOffered.reservationFor.id': { $exists: true },
+                orderNumber: params.orderNumber.$in
+            })
+                .setOptions({ maxTimeMS: 10000 })
+                .exec();
+        });
+    }
     getCursor(conditions, projection) {
         return this.orderModel.find(conditions, projection)
             .sort({ orderDate: factory.sortType.Descending })

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

@@ -96,6 +96,10 @@ export declare class MongoRepository {
         status?: {
             $eq?: factory.taskStatus;
         };
+        runsAt?: {
+            $gte: Date;
+            $lte: Date;
+        };
     }): Promise<import("mongodb").DeleteResult>;
     countDelayedTasks(params: {
         delayInSeconds: number;

package/lib/chevre/repo/task.js

@@ -411,9 +411,13 @@ class MongoRepository {
         });
     }
     deleteByName(params) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.taskModel.deleteMany(Object.assign({ name: { $eq: params.name } }, (typeof ((_a = params.status) === null || _a === void 0 ? void 0 : _a.$eq) === 'string') ? { status: { $eq: params.status.$eq } } : undefined))
+            return this.taskModel.deleteMany(Object.assign(Object.assign({ name: { $eq: params.name } }, (typeof ((_a = params.status) === null || _a === void 0 ? void 0 : _a.$eq) === 'string') ? { status: { $eq: params.status.$eq } } : undefined), (((_b = params.runsAt) === null || _b === void 0 ? void 0 : _b.$gte) instanceof Date)
+                ? {
+                    runsAt: { $gte: params.runsAt.$gte, $lte: params.runsAt.$lte }
+                }
+                : undefined))
                 .exec();
         });
     }

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

@@ -88,7 +88,13 @@ function deleteTransaction(params) {
                     deleteActionResult = yield repos.action.deleteByPurpose({
                         project: { id: transaction.project.id },
                         purpose: { id: transaction.id, typeOf: transaction.typeOf },
-                        typeOf: { $in: [factory.actionType.AuthorizeAction, factory.actionType.OrderAction] }
+                        typeOf: {
+                            $in: [
+                                factory.actionType.AuthorizeAction,
+                                factory.actionType.InformAction,
+                                factory.actionType.OrderAction
+                            ]
+                        }
                     });
                     // 取引削除
                     yield repos.transaction.findByIdAndDelete({ id: transaction.id });

package/lib/chevre/service/transaction/returnOrder.d.ts

@@ -1,15 +1,19 @@
 import * as factory from '../../factory';
 import { MongoRepository as EmailMessageRepo } from '../../repo/emailMessage';
+import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as MerchantReturnPolicyRepo } from '../../repo/merchantReturnPolicy';
 import { MongoRepository as OfferRepo } from '../../repo/offer';
+import { MongoRepository as OfferItemConditionRepo } from '../../repo/offerItemCondition';
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { MongoRepository as SellerRepo } from '../../repo/seller';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 import { MongoRepository as TransactionRepo } from '../../repo/transaction';
 export interface IStartOperationRepos {
+    event: EventRepo;
     merchantReturnPolicy: MerchantReturnPolicyRepo;
     offer: OfferRepo;
+    offerItemCondition: OfferItemConditionRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
     seller: SellerRepo;

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

@@ -22,9 +22,10 @@ const errorHandler_1 = require("../../errorHandler");
  * 返品取引開始
  */
 function start(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
-        const { orders, offerIds } = yield fixOrders(params)(repos);
+        const { eventIds, offerIds, orders } = yield fixOrders(params)(repos);
         // sellerはorderから自動取得
         const seller = yield repos.seller.findById({ id: String(orders[0].seller.id) }, { additionalProperty: 0, paymentAccepted: 0 });
         yield validateOrder({ orders })(repos);
@@ -36,12 +37,38 @@ function start(params) {
         }
         // tslint:disable-next-line:no-console
         // console.log('validating ', offers.length, 'offers before starting returnOrder... offerIds:', offerIds);
+        // イベント開始日時取得
+        let events = [];
+        if (eventIds.length > 0) {
+            events = yield repos.event.search({
+                id: { $in: eventIds },
+                typeOf: factory.eventType.ScreeningEvent
+            }, {
+                startDate: 1
+            });
+        }
+        let returnPolicies = seller.hasMerchantReturnPolicy;
+        if (!Array.isArray(returnPolicies)) {
+            returnPolicies = [];
+        }
+        // アイテムコンディション取得
+        let offerItemConditions = [];
+        const itemConditionIds = returnPolicies
+            .filter((returnPolicy) => { var _a; return typeof ((_a = returnPolicy.itemCondition) === null || _a === void 0 ? void 0 : _a.id) === 'string'; })
+            .map((returnPolicy) => { var _a; return String((_a = returnPolicy.itemCondition) === null || _a === void 0 ? void 0 : _a.id); });
+        if (itemConditionIds.length > 0) {
+            offerItemConditions = yield repos.offerItemCondition.search({
+                id: { $in: itemConditionIds }
+            });
+        }
         const policiesByOffer = yield searchPoliciesByOffer({ offers })(repos);
         const appliedReturnPolicy = findApplicableReturnPolicy({
+            events,
+            offerItemConditions,
             orders,
             returningDate: now,
             reason: params.object.reason,
-            seller,
+            returnPolicies,
             offers,
             policiesByOffer
         });
@@ -115,7 +142,8 @@ function fixOrders(params) {
             // 不要な属性は参照しない
             acceptedOffers: 0,
             customer: 0,
-            orderedItem: 0
+            orderedItem: 0,
+            paymentMethods: 0
         });
         if (orders.length !== params.object.order.length) {
             throw new factory.errors.NotFound('Order');
@@ -125,7 +153,10 @@ function fixOrders(params) {
             confirmationNumbers: [params.object.order[0].confirmationNumber],
             orderNumbers: [params.object.order[0].orderNumber]
         });
-        return { orders, offerIds };
+        const eventIds = yield repos.order.searchReservationForIdsByOrderNumbers({
+            orderNumber: { $in: [params.object.order[0].orderNumber] }
+        });
+        return { eventIds, offerIds, orders };
     });
 }
 function validateOrder(params) {
@@ -186,6 +217,7 @@ function searchPoliciesByOffer(params) {
 /**
  * 販売者の返品ポリシーを確認する
  */
+// tslint:disable-next-line:max-func-body-length
 function findApplicableReturnPolicy(params) {
     if (params.reason === factory.transaction.returnOrder.Reason.Seller) {
         // 販売者都合の場合、手数料なしの返金返品ポリシーを適用
@@ -194,14 +226,22 @@ function findApplicableReturnPolicy(params) {
             returnFees: factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn
         };
     }
-    let returnPolicies = params.seller.hasMerchantReturnPolicy;
-    if (!Array.isArray(returnPolicies)) {
-        returnPolicies = [];
-    }
+    const returnPolicies = params.returnPolicies;
     const returningDate = moment(params.returningDate);
-    const applicalbleReturnPolicies = [];
+    let applicalbleReturnPolicies = [];
     if (params.reason === factory.transaction.returnOrder.Reason.Customer) {
-        returnPolicies.forEach((returnPolicy) => {
+        // 適用可能なポリシーにフィルター
+        applicalbleReturnPolicies = returnPolicies.filter((returnPolicy) => {
+            var _a, _b, _c, _d, _e;
+            let satisfyMerchantReturnDays = false;
+            let offerItemCondition;
+            const itemConditionId = (_a = returnPolicy.itemCondition) === null || _a === void 0 ? void 0 : _a.id;
+            if (typeof itemConditionId === 'string') {
+                offerItemCondition = params.offerItemConditions.find((o) => o.id === itemConditionId);
+                if (offerItemCondition === undefined) {
+                    throw new factory.errors.NotFound('OfferItemCondition');
+                }
+            }
             const merchantReturnDays = returnPolicy.merchantReturnDays;
             if (typeof merchantReturnDays === 'number') {
                 // 返品適用日数を確認する
@@ -212,14 +252,57 @@ function findApplicableReturnPolicy(params) {
                 });
                 // 全注文について日数の確認ができれば適用
                 if (everyOrderApplicable) {
-                    applicalbleReturnPolicies.push(returnPolicy);
+                    satisfyMerchantReturnDays = true;
                 }
             }
             else {
                 // 日数制限なし
-                applicalbleReturnPolicies.push(returnPolicy);
+                satisfyMerchantReturnDays = true;
             }
+            // イベント開始猶予を検証する(2023-05-22~)
+            let satisfyItemCondition = true;
+            if (offerItemCondition !== undefined) {
+                let satisfyGracePeriodMaxValue = true;
+                let satisfyGracePeriodMinValue = true;
+                // 全イベントについて猶予の確認ができれば適用
+                const gracePeriodMaxValue = (_c = (_b = offerItemCondition.itemOffered.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservationFor.gracePeriodBeforeStart) === null || _c === void 0 ? void 0 : _c.maxValue;
+                const gracePeriodMinValue = (_e = (_d = offerItemCondition.itemOffered.serviceOutput) === null || _d === void 0 ? void 0 : _d.reservationFor.gracePeriodBeforeStart) === null || _e === void 0 ? void 0 : _e.minValue;
+                if (typeof gracePeriodMaxValue === 'number') {
+                    satisfyGracePeriodMaxValue = params.events.every((event) => {
+                        return moment(event.startDate)
+                            .isSameOrBefore(moment(params.returningDate)
+                            .add(gracePeriodMaxValue, 'seconds'));
+                    });
+                }
+                if (typeof gracePeriodMinValue === 'number') {
+                    satisfyGracePeriodMinValue = params.events.every((event) => {
+                        return moment(event.startDate)
+                            .isSameOrAfter(moment(params.returningDate)
+                            .add(gracePeriodMinValue, 'seconds'));
+                    });
+                }
+                satisfyItemCondition = satisfyGracePeriodMaxValue && satisfyGracePeriodMinValue;
+            }
+            return satisfyMerchantReturnDays && satisfyItemCondition;
         });
+        // returnPolicies.forEach((returnPolicy) => {
+        //     const merchantReturnDays = returnPolicy.merchantReturnDays;
+        //     if (typeof merchantReturnDays === 'number') {
+        //         // 返品適用日数を確認する
+        //         const everyOrderApplicable = params.orders.every((order) => {
+        //             const mustBeReturnedUntil = moment(order.orderDate)
+        //                 .add(merchantReturnDays, 'days');
+        //             return mustBeReturnedUntil.isSameOrAfter(returningDate);
+        //         });
+        //         // 全注文について日数の確認ができれば適用
+        //         if (everyOrderApplicable) {
+        //             applicalbleReturnPolicies.push(returnPolicy);
+        //         }
+        //     } else {
+        //         // 日数制限なし
+        //         applicalbleReturnPolicies.push(returnPolicy);
+        //     }
+        // });
     }
     // 販売者にポリシーが存在しなければ返品不可
     if (applicalbleReturnPolicies.length === 0) {
@@ -227,9 +310,20 @@ function findApplicableReturnPolicy(params) {
     }
     // オファーの返品ポリシーから返品手数料タイプを決定する
     const { returnFees } = validateOffersReturnPolicy({ offers: params.offers, policiesByOffer: params.policiesByOffer });
+    // restockingFeeが最低のポリシーを自動選択
+    let appliedReturnPolicy = applicalbleReturnPolicies[0];
+    applicalbleReturnPolicies.forEach((returnPolicy) => {
+        const appliedReturnPolicyRestockingFee = (typeof appliedReturnPolicy.restockingFee === 'number')
+            ? appliedReturnPolicy.restockingFee
+            : 0;
+        const restockingFee = (typeof returnPolicy.restockingFee === 'number') ? returnPolicy.restockingFee : 0;
+        if (restockingFee < appliedReturnPolicyRestockingFee) {
+            appliedReturnPolicy = returnPolicy;
+        }
+    });
     return {
-        merchantReturnDays: applicalbleReturnPolicies[0].merchantReturnDays,
-        restockingFee: applicalbleReturnPolicies[0].restockingFee,
+        merchantReturnDays: appliedReturnPolicy.merchantReturnDays,
+        restockingFee: appliedReturnPolicy.restockingFee,
         returnFees,
         typeOf: 'MerchantReturnPolicy'
     };

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.4",
+    "@chevre/factory": "4.313.0-alpha.5",
     "@cinerino/sdk": "3.156.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.60"
+  "version": "21.2.0-alpha.62"
 }