@chevre/domain 21.20.0-alpha.62 → 21.20.0-alpha.63

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

@@ -1,6 +1,11 @@
-import type { Connection, Model } from 'mongoose';
+import type { Connection, PipelineStage } from 'mongoose';
 import * as factory from '../factory';
+type IMatchStage = PipelineStage.Match;
 export type IOrder4report = factory.report.accountingReport.IOrderAsMainEntity;
+export interface IChildReport {
+    typeOf: 'Report';
+    mainEntity: factory.report.accountingReport.IAction;
+}
 export interface IAccountingReport {
     project: {
         id: string;
@@ -14,8 +19,13 @@ export interface IAccountingReport {
  * 経理レポートリポジトリ
  */
 export declare class MongoRepository {
-    readonly accountingReportModel: typeof Model;
+    private readonly accountingReportModel;
     constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: factory.report.accountingReport.ISearchConditions & {
+        seller?: {
+            id?: string;
+        };
+    }): IMatchStage[];
     /**
      * なければ作成する
      */
@@ -28,4 +38,16 @@ export declare class MongoRepository {
             orderNumber: string;
         };
     }): Promise<void>;
+    addChildReport(params: {
+        mainEntity: {
+            orderNumber: string;
+        };
+        hasPart: IChildReport;
+    }): Promise<void>;
+    search(params: factory.report.accountingReport.ISearchConditions & {
+        seller?: {
+            id?: string;
+        };
+    }): Promise<any[]>;
 }
+export {};

package/lib/chevre/repo/accountingReport.js

@@ -12,6 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const accountingReport_1 = require("./mongoose/schemas/accountingReport");
 const errorHandler_1 = require("../errorHandler");
+const factory = require("../factory");
+const DEFAULT_SEARCH_LIMIT = 100;
 /**
  * 経理レポートリポジトリ
  */
@@ -19,6 +21,67 @@ class MongoRepository {
     constructor(connection) {
         this.accountingReportModel = connection.model(accountingReport_1.modelName, (0, accountingReport_1.createSchema)());
     }
+    static CREATE_MONGO_CONDITIONS(params) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+        const matchStages = [];
+        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') {
+            matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
+        }
+        // req.seller.idを考慮(2023-07-21~)
+        if (typeof ((_c = params.seller) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
+            matchStages.push({ $match: { 'mainEntity.seller.id': { $exists: true, $eq: params.seller.id } } });
+        }
+        const orderNumberEq = (_e = (_d = params.order) === null || _d === void 0 ? void 0 : _d.orderNumber) === null || _e === void 0 ? void 0 : _e.$eq;
+        if (typeof orderNumberEq === 'string') {
+            matchStages.push({ $match: { 'mainEntity.orderNumber': { $eq: orderNumberEq } } });
+        }
+        const sellerIdEq = (_h = (_g = (_f = params.order) === null || _f === void 0 ? void 0 : _f.seller) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
+        if (typeof sellerIdEq === 'string') {
+            matchStages.push({ $match: { 'mainEntity.seller.id': { $exists: true, $eq: sellerIdEq } } });
+        }
+        const paymentMethodIdEq = (_l = (_k = (_j = params.order) === null || _j === void 0 ? void 0 : _j.paymentMethods) === null || _k === void 0 ? void 0 : _k.paymentMethodId) === null || _l === void 0 ? void 0 : _l.$eq;
+        if (typeof paymentMethodIdEq === 'string') {
+            matchStages.push({
+                $match: { 'mainEntity.paymentMethods.paymentMethodId': { $exists: true, $eq: paymentMethodIdEq } }
+            });
+        }
+        const orderDateGte = (_o = (_m = params.order) === null || _m === void 0 ? void 0 : _m.orderDate) === null || _o === void 0 ? void 0 : _o.$gte;
+        if (orderDateGte instanceof Date) {
+            matchStages.push({
+                $match: { 'mainEntity.orderDate': { $gte: orderDateGte } }
+            });
+        }
+        const orderDateLte = (_q = (_p = params.order) === null || _p === void 0 ? void 0 : _p.orderDate) === null || _q === void 0 ? void 0 : _q.$lte;
+        if (orderDateLte instanceof Date) {
+            matchStages.push({
+                $match: { 'mainEntity.orderDate': { $lte: orderDateLte } }
+            });
+        }
+        const reservationForStartDateGte = (_v = (_u = (_t = (_s = (_r = params.order) === null || _r === void 0 ? void 0 : _r.acceptedOffers) === null || _s === void 0 ? void 0 : _s.itemOffered) === null || _t === void 0 ? void 0 : _t.reservationFor) === null || _u === void 0 ? void 0 : _u.startDate) === null || _v === void 0 ? void 0 : _v.$gte;
+        if (reservationForStartDateGte instanceof Date) {
+            matchStages.push({
+                $match: {
+                    'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': {
+                        $exists: true,
+                        $gte: reservationForStartDateGte
+                    }
+                }
+            });
+        }
+        const reservationForStartDateLte = (_0 = (_z = (_y = (_x = (_w = params.order) === null || _w === void 0 ? void 0 : _w.acceptedOffers) === null || _x === void 0 ? void 0 : _x.itemOffered) === null || _y === void 0 ? void 0 : _y.reservationFor) === null || _z === void 0 ? void 0 : _z.startDate) === null || _0 === void 0 ? void 0 : _0.$lte;
+        if (reservationForStartDateLte instanceof Date) {
+            matchStages.push({
+                $match: {
+                    'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': {
+                        $exists: true,
+                        $lte: reservationForStartDateLte
+                    }
+                }
+            });
+        }
+        return matchStages;
+    }
     /**
      * なければ作成する
      */
@@ -51,5 +114,41 @@ class MongoRepository {
                 .exec();
         });
     }
+    addChildReport(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.accountingReportModel.updateOne({ 'mainEntity.orderNumber': { $eq: params.mainEntity.orderNumber } }, { $addToSet: { hasPart: params.hasPart } })
+                .exec();
+        });
+    }
+    search(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const limit = (typeof params.limit === 'number') ? Math.min(params.limit, DEFAULT_SEARCH_LIMIT) : DEFAULT_SEARCH_LIMIT;
+            const page = (typeof params.page === 'number') ? Math.max(params.page, 1) : 1;
+            const unwindAcceptedOffers = params.$unwindAcceptedOffers === '1';
+            const matchStages = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const aggregate = this.accountingReportModel.aggregate([
+                // pipelineの順序に注意
+                // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
+                { $sort: { 'mainEntity.orderDate': factory.sortType.Descending } },
+                { $unwind: '$hasPart' },
+                ...(unwindAcceptedOffers) ? [{ $unwind: '$mainEntity.acceptedOffers' }] : [],
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        mainEntity: '$hasPart.mainEntity',
+                        isPartOf: {
+                            mainEntity: '$mainEntity'
+                        }
+                    }
+                }
+            ]);
+            return aggregate.allowDiskUse(true)
+                .limit(limit * page)
+                .skip(limit * (page - 1))
+                // .setOptions({ maxTimeMS: 10000 })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/service/payment/any/onPaymentStatusChanged/onPaid.js

@@ -47,8 +47,10 @@ function onReturnFeePaid(params) {
             }
             : undefined);
         const childReport = { typeOf: 'Report', mainEntity: action4save };
-        yield repos.accountingReport.accountingReportModel.findOneAndUpdate({ 'mainEntity.orderNumber': orderNumber }, { $addToSet: { hasPart: childReport } })
-            .exec();
+        yield repos.accountingReport.addChildReport({
+            mainEntity: { orderNumber },
+            hasPart: childReport
+        });
     });
 }
 function onOrderPaid(params) {
@@ -67,7 +69,9 @@ function onOrderPaid(params) {
             }
             : undefined);
         const childReport = { typeOf: 'Report', mainEntity: action4save };
-        yield repos.accountingReport.accountingReportModel.findOneAndUpdate({ 'mainEntity.orderNumber': orderNumber }, { $addToSet: { hasPart: childReport } })
-            .exec();
+        yield repos.accountingReport.addChildReport({
+            mainEntity: { orderNumber },
+            hasPart: childReport
+        });
     });
 }

package/lib/chevre/service/payment/any/onPaymentStatusChanged/onRefunded.js

@@ -43,7 +43,9 @@ function onOrderRefunded(params) {
             }
             : undefined);
         const childReport = { typeOf: 'Report', mainEntity: action4save };
-        yield repos.accountingReport.accountingReportModel.findOneAndUpdate({ 'mainEntity.orderNumber': orderNumber }, { $addToSet: { hasPart: childReport } })
-            .exec();
+        yield repos.accountingReport.addChildReport({
+            mainEntity: { orderNumber },
+            hasPart: childReport
+        });
     });
 }

package/package.json

@@ -111,5 +111,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.0-alpha.62"
+  "version": "21.20.0-alpha.63"
 }

package/example/src/chevre/cleanAccountingReports.ts

@@ -1,57 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: '' };
-// const MASKED_PROFILE = '****';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const accountingReportRepo = await chevre.repository.AccountingReport.createInstance(mongoose.connection);
-
-    const cursor = await accountingReportRepo.accountingReportModel.find(
-        {
-            'mainEntity.orderDate': {
-                $lt: moment()
-                    .add(-1, 'year')
-                    .toDate()
-            }
-        },
-        {
-            // _id: 1,
-        }
-    )
-        // .limit(10)
-        .sort({ 'mainEntity.orderDate': chevre.factory.sortType.Descending })
-        .cursor();
-    console.log('reports found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const accountingReport = doc.toObject();
-
-        console.log(
-            'deleting report...',
-            accountingReport.id, accountingReport.mainEntity.orderNumber, accountingReport.mainEntity.orderDate, i);
-        await accountingReportRepo.accountingReportModel.findByIdAndDelete(
-            accountingReport.id
-        )
-            .exec();
-        updateCount += 1;
-        console.log(
-            'report deleted',
-            accountingReport.id, accountingReport.mainEntity.orderNumber, accountingReport.mainEntity.orderDate, i);
-    });
-
-    console.log(i, 'reports checked');
-    console.log(updateCount, 'reports updated');
-}
-
-main()
-    .then()
-    .catch(console.error);