@chevre/domain 20.2.0-alpha.20 → 20.2.0-alpha.22

package/example/src/chevre/aggregation/aggregateSystem.ts

@@ -6,6 +6,7 @@ import { chevre } from '../../../../lib/index';
 // const project = { id: <string>process.env.PROJECT_ID };
 const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
 const AGGREGATE_DAYS = Number(process.env.AGGREGATE_DAYS);
+const AGGREGATE_CLIENT_IDS = (typeof process.env.AGGREGATE_CLIENT_IDS === 'string') ? process.env.AGGREGATE_CLIENT_IDS.split(',') : [];
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
@@ -16,15 +17,16 @@ async function main() {
     const orderRepo = new chevre.repository.Order(mongoose.connection);
     const actionRepo = new chevre.repository.Action(mongoose.connection);
 
-    await chevre.service.aggregation.system.aggregateAuthorizeOrderAction({
+    await chevre.service.aggregation.system.aggregatePlaceOrder({
         aggregationDays: AGGREGATE_DAYS,
-        excludedProjectId: EXCLUDED_PROJECT_ID
+        excludedProjectId: EXCLUDED_PROJECT_ID,
+        clientIds: AGGREGATE_CLIENT_IDS
     })({
         agregation: aggregationRepo,
-        action: actionRepo
+        transaction: transactionRepo
     });
 
-    await chevre.service.aggregation.system.aggregateAuthorizeEventServiceOfferAction({
+    await chevre.service.aggregation.system.aggregateAuthorizeOrderAction({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
@@ -32,7 +34,7 @@ async function main() {
         action: actionRepo
     });
 
-    await chevre.service.aggregation.system.aggregateAuthorizePaymentAction({
+    await chevre.service.aggregation.system.aggregateAuthorizeEventServiceOfferAction({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
@@ -40,7 +42,7 @@ async function main() {
         action: actionRepo
     });
 
-    await chevre.service.aggregation.system.aggregateUseAction({
+    await chevre.service.aggregation.system.aggregateAuthorizePaymentAction({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
@@ -48,12 +50,12 @@ async function main() {
         action: actionRepo
     });
 
-    await chevre.service.aggregation.system.aggregatePlaceOrder({
+    await chevre.service.aggregation.system.aggregateUseAction({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        transaction: transactionRepo
+        action: actionRepo
     });
 
     await chevre.service.aggregation.system.aggregateOrder({

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

@@ -9,6 +9,10 @@ export declare enum AggregationType {
     AggregateReservation = "AggregateReservation",
     AggregateUseAction = "AggregateUseAction"
 }
+export interface IAggregationByClient {
+    clientId: string;
+    aggregation: any;
+}
 export interface IAggregation {
     typeOf: AggregationType;
     project: {
@@ -18,6 +22,7 @@ export interface IAggregation {
     aggregateDate: Date;
     aggregateDuration: string;
     aggregateStart: Date;
+    aggregationByClient?: IAggregationByClient[];
 }
 /**
  * 集計リポジトリ

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

@@ -30,12 +30,6 @@ export declare class MongoRepository {
     /**
      * 予約確定
      */
-    confirm<T extends factory.reservationType>(params: {
-        id: string;
-        previousReservationStatus: factory.reservationStatusType;
-        underName?: factory.reservation.IUnderName<T>;
-        reservedTicket?: factory.reservation.ITicket;
-    }): Promise<factory.reservation.IReservation<T>>;
     confirmByReservationNumber(params: {
         reservationNumber: string;
         previousReservationStatus: factory.reservationStatusType;

package/lib/chevre/repo/reservation.js

@@ -915,49 +915,54 @@ class MongoRepository {
     /**
      * 予約確定
      */
-    confirm(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = {
-                _id: { $eq: String(params.id) },
-                reservationStatus: { $eq: params.previousReservationStatus }
-            };
-            // 更新属性をwhitelist化(2022-06-13~)
-            const update = Object.assign(Object.assign({ 
-                // ...params,
-                reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }, (params.underName !== undefined) ? { underName: params.underName } : undefined), (params.reservedTicket !== undefined) ? { reservedTicket: params.reservedTicket } : undefined);
-            // 以下値は更新しない(他処理で更新される可能性あり)
-            // if (typeof update.checkedIn === 'boolean') {
-            //     delete update.checkedIn;
-            // }
-            // if (typeof update.attended === 'boolean') {
-            //     delete update.attended;
-            // }
-            const doc = yield this.reservationModel.findOneAndUpdate(conditions, update, { new: true })
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 })
-                .exec();
-            // NotFoundであれば状態確認
-            if (doc === null) {
-                const reservation = yield this.findById({ id: String(params.id) });
-                if (reservation.reservationStatus === factory.reservationStatusType.ReservationConfirmed) {
-                    // すでに確定済の場合
-                    return reservation;
-                }
-                else {
-                    throw new factory.errors.Argument('id', `Reservation ${reservation.id} already changed -> ${reservation.reservationStatus}`);
-                }
-            }
-            return doc.toObject();
-        });
-    }
+    // public async confirm<T extends factory.reservationType>(params: {
+    //     id: string;
+    //     previousReservationStatus: factory.reservationStatusType;
+    //     underName?: factory.reservation.IUnderName<T>;
+    // }): Promise<factory.reservation.IReservation<T>> {
+    //     const conditions = {
+    //         _id: { $eq: String(params.id) },
+    //         reservationStatus: { $eq: params.previousReservationStatus }
+    //     };
+    //     // 更新属性をwhitelist化(2022-06-13~)
+    //     const update = {
+    //         // previousReservationStatusを保管(2023-01-19~)
+    //         previousReservationStatus: params.previousReservationStatus,
+    //         reservationStatus: factory.reservationStatusType.ReservationConfirmed,
+    //         modifiedTime: new Date(),
+    //         ...(params.underName !== undefined) ? { underName: params.underName } : undefined
+    //     };
+    //     const doc = await this.reservationModel.findOneAndUpdate(
+    //         conditions,
+    //         update,
+    //         { new: true }
+    //     )
+    //         .select({ __v: 0, createdAt: 0, updatedAt: 0 })
+    //         .exec();
+    //     // NotFoundであれば状態確認
+    //     if (doc === null) {
+    //         const reservation = await this.findById<T>({ id: String(params.id) });
+    //         if (reservation.reservationStatus === factory.reservationStatusType.ReservationConfirmed) {
+    //             // すでに確定済の場合
+    //             return reservation;
+    //         } else {
+    //             throw new factory.errors.Argument(
+    //                 'id',
+    //                 `Reservation ${reservation.id} already changed -> ${reservation.reservationStatus}`
+    //             );
+    //         }
+    //     }
+    //     return doc.toObject();
+    // }
     confirmByReservationNumber(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = {
                 reservationNumber: { $eq: String(params.reservationNumber) },
                 reservationStatus: { $eq: params.previousReservationStatus }
             };
-            const update = Object.assign({ reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }, (params.underName !== undefined) ? { underName: params.underName } : undefined
-            // ...(params.reservedTicket !== undefined) ? { reservedTicket: params.reservedTicket } : undefined
-            );
+            const update = Object.assign({ 
+                // previousReservationStatusを保管(2023-01-19~)
+                previousReservationStatus: params.previousReservationStatus, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }, (params.underName !== undefined) ? { underName: params.underName } : undefined);
             yield this.reservationModel.updateMany(conditions, update)
                 .exec();
         });

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

@@ -6,7 +6,7 @@ import * as factory from '../factory';
 export declare class MongoRepository {
     readonly taskModel: typeof Model;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS<T extends factory.taskName>(params: factory.task.ISearchConditions<T>): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): any[];
     save(taskAttributes: factory.task.IAttributes<factory.taskName>): Promise<factory.task.ITask<factory.taskName>>;
     saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[]): Promise<any[]>;
     executeOneByName<T extends factory.taskName>(params: {
@@ -29,11 +29,11 @@ export declare class MongoRepository {
         name: T;
         id: string;
     }): Promise<factory.task.ITask<T>>;
-    count<T extends factory.taskName>(params: factory.task.ISearchConditions<T>): Promise<number>;
+    count(params: factory.task.ISearchConditions): Promise<number>;
     /**
      * 検索する
      */
-    search<T extends factory.taskName>(params: factory.task.ISearchConditions<T>, projection?: any): Promise<factory.task.ITask<T>[]>;
+    search(params: factory.task.ISearchConditions, projection?: any): Promise<factory.task.ITask<factory.taskName>[]>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/task.js

@@ -29,29 +29,24 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        const andConditions = [{
-                name: { $exists: true }
-            }];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.project !== undefined) {
-            if (params.project.id !== undefined && params.project.id !== null) {
-                if (typeof params.project.id.$eq === 'string') {
-                    andConditions.push({
-                        'project.id': {
-                            $eq: params.project.id.$eq
-                        }
-                    });
-                }
-            }
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        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 } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.name !== undefined) {
-            andConditions.push({
-                name: params.name
-            });
+        if (typeof params.name === 'string') {
+            andConditions.push({ name: { $eq: params.name } });
+        }
+        else {
+            const nameIn = (_c = params.name) === null || _c === void 0 ? void 0 : _c.$in;
+            if (Array.isArray(nameIn)) {
+                andConditions.push({ name: { $in: nameIn } });
+            }
+            const nameNin = (_d = params.name) === null || _d === void 0 ? void 0 : _d.$nin;
+            if (Array.isArray(nameNin)) {
+                andConditions.push({ name: { $nin: nameNin } });
+            }
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -94,7 +89,7 @@ class MongoRepository {
                 }
             });
         }
-        const dateAbortedGte = (_a = params.dateAborted) === null || _a === void 0 ? void 0 : _a.$gte;
+        const dateAbortedGte = (_e = params.dateAborted) === null || _e === void 0 ? void 0 : _e.$gte;
         if (dateAbortedGte instanceof Date) {
             andConditions.push({
                 dateAborted: {
@@ -103,7 +98,7 @@ class MongoRepository {
                 }
             });
         }
-        const dateAbortedLte = (_b = params.dateAborted) === null || _b === void 0 ? void 0 : _b.$lte;
+        const dateAbortedLte = (_f = params.dateAborted) === null || _f === void 0 ? void 0 : _f.$lte;
         if (dateAbortedLte instanceof Date) {
             andConditions.push({
                 dateAborted: {
@@ -112,7 +107,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectTransactionNumberEq = (_e = (_d = (_c = params.data) === null || _c === void 0 ? void 0 : _c.object) === null || _d === void 0 ? void 0 : _d.transactionNumber) === null || _e === void 0 ? void 0 : _e.$eq;
+        const objectTransactionNumberEq = (_j = (_h = (_g = params.data) === null || _g === void 0 ? void 0 : _g.object) === null || _h === void 0 ? void 0 : _h.transactionNumber) === null || _j === void 0 ? void 0 : _j.$eq;
         if (typeof objectTransactionNumberEq === 'string') {
             andConditions.push({
                 'data.object.transactionNumber': {
@@ -121,7 +116,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPurposeIdEq = (_h = (_g = (_f = params.data) === null || _f === void 0 ? void 0 : _f.purpose) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
+        const objectPurposeIdEq = (_m = (_l = (_k = params.data) === null || _k === void 0 ? void 0 : _k.purpose) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$eq;
         if (typeof objectPurposeIdEq === 'string') {
             andConditions.push({
                 'data.purpose.id': {
@@ -130,7 +125,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPurposeOrderNumberEq = (_l = (_k = (_j = params.data) === null || _j === void 0 ? void 0 : _j.purpose) === null || _k === void 0 ? void 0 : _k.orderNumber) === null || _l === void 0 ? void 0 : _l.$eq;
+        const objectPurposeOrderNumberEq = (_q = (_p = (_o = params.data) === null || _o === void 0 ? void 0 : _o.purpose) === null || _p === void 0 ? void 0 : _p.orderNumber) === null || _q === void 0 ? void 0 : _q.$eq;
         if (typeof objectPurposeOrderNumberEq === 'string') {
             andConditions.push({
                 'data.purpose.orderNumber': {

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

@@ -16,7 +16,7 @@ interface IStatus {
     status: factory.transactionStatusType;
     aggregation: IAggregationByStatus;
 }
-interface IAggregatePlaceOrder {
+export interface IAggregatePlaceOrder {
     statuses: IStatus[];
 }
 /**
@@ -155,6 +155,7 @@ export declare class MongoRepository {
         startFrom: Date;
         startThrough: Date;
         typeOf: factory.transactionType;
+        clientId?: string;
     }): Promise<IAggregatePlaceOrder>;
     private agggregateByStatus;
 }

package/lib/chevre/repo/transaction.js

@@ -608,11 +608,19 @@ class MongoRepository {
                 factory.transactionStatusType.Confirmed
             ].map((transactionStatus) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
-                const matchConditions = Object.assign({ startDate: {
+                const matchConditions = Object.assign(Object.assign({ startDate: {
                         $gte: params.startFrom,
                         $lte: params.startThrough
                     }, typeOf: { $eq: params.typeOf }, status: { $eq: transactionStatus } }, (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$ne) === 'string')
                     ? { 'project.id': { $ne: params.project.id.$ne } }
+                    : undefined), (typeof params.clientId === 'string')
+                    // customerIdentifierAll.push();
+                    ? {
+                        'agent.identifier': {
+                            $exists: true,
+                            $all: [{ name: 'clientId', value: params.clientId }]
+                        }
+                    }
                     : undefined);
                 return this.agggregateByStatus({ matchConditions, status: transactionStatus });
             })));

package/lib/chevre/service/aggregation/system.d.ts

@@ -9,6 +9,7 @@ import { MongoRepository as TransactionRepo } from '../../repo/transaction';
 declare function aggregatePlaceOrder(params: {
     aggregationDays: number;
     excludedProjectId?: string;
+    clientIds?: string[];
 }): (repos: {
     agregation: AggregationRepo;
     transaction: TransactionRepo;

package/lib/chevre/service/aggregation/system.js

@@ -44,7 +44,22 @@ function aggregatePlaceOrder(params) {
                 typeOf: factory.transactionType.PlaceOrder
             });
             debug('aggregatePlaceOrder:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
-            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregatePlaceOrder, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
+            const aggregateResultsByClientId = [];
+            if (Array.isArray(params.clientIds)) {
+                for (const clientId of params.clientIds) {
+                    aggregateResultsByClientId.push({
+                        clientId,
+                        aggregation: yield repos.transaction.aggregatePlaceOrder({
+                            project: { id: { $ne: params.excludedProjectId } },
+                            startFrom,
+                            startThrough,
+                            typeOf: factory.transactionType.PlaceOrder,
+                            clientId
+                        })
+                    });
+                }
+            }
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregatePlaceOrder, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate, aggregationByClient: aggregateResultsByClientId }, aggregateResult));
         }
     });
 }

package/lib/chevre/service/assetTransaction/reserve/factory.js

@@ -468,7 +468,10 @@ function createPotentialActions(params) {
                 underName
             }));
         });
-        const reservationPackage = Object.assign({ reservationFor, reservationNumber: pendingReservations[0].reservationNumber, reservationStatus: pendingReservations[0].reservationStatus, subReservation: pendingReservations, typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string') ? { underName } : undefined);
+        const reservationPackage = Object.assign({ reservationFor, reservationNumber: pendingReservations[0].reservationNumber, reservationStatus: pendingReservations[0].reservationStatus, 
+            // 不要なので廃止(2023-01-19~)
+            // subReservation: pendingReservations,
+            typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string') ? { underName } : undefined);
         reserveActionAttributes = [{
                 project: transaction.project,
                 typeOf: factory.actionType.ReserveAction,

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

@@ -37,17 +37,14 @@ function confirmReservation(actionAttributesList) {
                         });
                     }
                     else {
+                        // 廃止(2023-01-18)
+                        throw new factory.errors.Forbidden(`${reservation.typeOf} not acceptable`);
                         // 予約を確定状態に変更する
-                        // reservation = await repos.reservation.confirm<factory.reservationType.EventReservation>({
-                        yield repos.reservation.confirm({
-                            // 更新属性をwhitelist化(2022-06-13~)
-                            // ...actionAttributes.object,
-                            id: reservation.id,
-                            previousReservationStatus: reservation.reservationStatus,
-                            underName: reservation.underName
-                            // issuedThroughは予約取引開始時に確定しているので更新不要(2022-12-21~)
-                            // reservedTicket: reservation.reservedTicket
-                        });
+                        // await repos.reservation.confirm<factory.reservationType.EventReservation>({
+                        //     id: reservation.id,
+                        //     previousReservationStatus: reservation.reservationStatus,
+                        //     underName: reservation.underName
+                        // });
                         // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                         // delete (<any>reservation)._id;
                         // confirmedReservations.push(reservation);

package/lib/chevre/service/task.js

@@ -113,16 +113,13 @@ function abort(params) {
 exports.abort = abort;
 function notifyAbortedTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let abortedTasks = yield repos.task.search({
-            statuses: [factory.taskStatus.Aborted],
-            dateAborted: {
-                $gte: params.dateAbortedGte
-            }
-        });
+        const abortedTasks = yield repos.task.search(Object.assign({ statuses: [factory.taskStatus.Aborted], dateAborted: { $gte: params.dateAbortedGte } }, (settings_1.ABORTED_TASKS_WITHOUT_REPORT.length > 0)
+            ? { name: { $nin: settings_1.ABORTED_TASKS_WITHOUT_REPORT } }
+            : undefined));
         // 中止を報告しないタスク以外にフィルター
-        abortedTasks = abortedTasks.filter((task) => {
-            return !settings_1.ABORTED_TASKS_WITHOUT_REPORT.includes(task.name);
-        });
+        // abortedTasks = abortedTasks.filter((task) => {
+        //     return !ABORTED_TASKS_WITHOUT_REPORT.includes(task.name);
+        // });
         if (abortedTasks.length > 0) {
             // 開発者へ報告
             const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.282.0-alpha.0",
+    "@chevre/factory": "4.283.0",
     "@cinerino/sdk": "3.135.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.20"
+  "version": "20.2.0-alpha.22"
 }