@chevre/domain 20.2.0-alpha.15 → 20.2.0-alpha.16

package/example/src/chevre/aggregateOrdersGlobally.ts

@@ -0,0 +1,83 @@
+// tslint:disable:no-console
+import * as moment from 'moment-timezone';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: <string>process.env.PROJECT_ID };
+interface IAggregation {
+    typeOf: 'AggregateOrder';
+    project: { id: string; typeOf: chevre.factory.organizationType.Project };
+    aggregateDate: Date;
+    aggregateDuration: string;
+    aggregateStart: Date;
+    orderCount: number;
+    acceptedOfferCount: number;
+}
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const now: Date = new Date();
+
+    const aggregationRepo = new chevre.repository.Aggregation(mongoose.connection);
+    const orderRepo = new chevre.repository.Order(mongoose.connection);
+
+    let i = 0;
+    // tslint:disable-next-line:no-magic-numbers
+    while (i < 7) {
+        i += 1;
+
+        const orderDateFrom: Date = moment()
+            // .tz('Asia/Tokyo')
+            .add(-i, 'days')
+            .startOf('day')
+            .toDate();
+        const orderDateThrough: Date = moment()
+            // .tz('Asia/Tokyo')
+            .add(-i, 'days')
+            .endOf('day')
+            .toDate();
+        // console.log(bookingFrom, bookingThrough);
+
+        const aggregateResult = await orderRepo.aggregateOrder({
+            orderDate: {
+                $gte: orderDateFrom,
+                $lte: orderDateThrough
+            }
+        });
+
+        const aggregation: IAggregation = {
+            typeOf: 'AggregateOrder',
+            project: { id: '*', typeOf: chevre.factory.organizationType.Project },
+            aggregateDuration: moment.duration(1, 'days')
+                .toISOString(),
+            aggregateStart: orderDateFrom,
+            aggregateDate: now,
+            orderCount: (aggregateResult.length > 0) ? aggregateResult[0].orderCount : 0,
+            acceptedOfferCount: (aggregateResult.length > 0) ? aggregateResult[0].acceptedOfferCount : 0
+        };
+        const { acceptedOfferCount, orderCount, aggregateDate, ...setOnInsert } = aggregation;
+        const doc = await aggregationRepo.aggregationModel.findOneAndUpdate(
+            {
+                typeOf: { $eq: aggregation.typeOf },
+                'project.id': { $eq: aggregation.project.id },
+                aggregateStart: { $eq: aggregation.aggregateStart },
+                aggregateDuration: { $eq: aggregation.aggregateDuration }
+            },
+            {
+                $setOnInsert: setOnInsert,
+                $set: { aggregateDate, orderCount, acceptedOfferCount }
+            },
+            { upsert: true }
+        )
+            .exec();
+        console.log(doc);
+    }
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/aggregateReservationsGlobally.ts

@@ -0,0 +1,84 @@
+// tslint:disable:no-console
+import * as moment from 'moment-timezone';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: <string>process.env.PROJECT_ID };
+interface IAggregation {
+    typeOf: 'AggregateReservation';
+    project: { id: string; typeOf: chevre.factory.organizationType.Project };
+    aggregateDate: Date;
+    aggregateDuration: string;
+    aggregateStart: Date;
+    // bookingTime: Date;
+    reservationCount: number;
+}
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const now: Date = new Date();
+
+    const aggregationRepo = new chevre.repository.Aggregation(mongoose.connection);
+    const reservationRepo = new chevre.repository.Reservation(mongoose.connection);
+
+    let i = 0;
+    // tslint:disable-next-line:no-magic-numbers
+    while (i < 7) {
+        i += 1;
+
+        const bookingFrom: Date = moment()
+            // .tz('Asia/Tokyo')
+            .add(-i, 'days')
+            .startOf('day')
+            .toDate();
+        const bookingThrough: Date = moment()
+            // .tz('Asia/Tokyo')
+            .add(-i, 'days')
+            .endOf('day')
+            .toDate();
+        // console.log(bookingFrom, bookingThrough);
+
+        // i日前の予約検索
+        const searchReservationCountResult = await reservationRepo.count({
+            typeOf: chevre.factory.reservationType.EventReservation,
+            reservationStatus: { $eq: chevre.factory.reservationStatusType.ReservationConfirmed },
+            bookingFrom,
+            bookingThrough
+        });
+
+        const aggregation: IAggregation = {
+            typeOf: 'AggregateReservation',
+            project: { id: '*', typeOf: chevre.factory.organizationType.Project },
+            aggregateDuration: moment.duration(1, 'days')
+                .toISOString(),
+            aggregateStart: bookingFrom,
+            aggregateDate: now,
+            reservationCount: searchReservationCountResult
+        };
+        console.log(aggregation);
+        const { reservationCount, aggregateDate, ...setOnInsert } = aggregation;
+        const doc = await aggregationRepo.aggregationModel.findOneAndUpdate(
+            {
+                typeOf: { $eq: aggregation.typeOf },
+                'project.id': { $eq: aggregation.project.id },
+                aggregateStart: { $eq: aggregation.aggregateStart },
+                aggregateDuration: { $eq: aggregation.aggregateDuration }
+            },
+            {
+                $setOnInsert: setOnInsert,
+                $set: { aggregateDate, reservationCount }
+            },
+            { upsert: true }
+        )
+            .exec();
+        console.log(doc);
+    }
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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

@@ -76,4 +76,8 @@ export declare class MongoRepository {
             $in: string[];
         };
     }): Promise<(string)[]>;
+    aggregateOrder(params: factory.order.ISearchConditions): Promise<{
+        acceptedOfferCount: number;
+        orderCount: number;
+    }[]>;
 }

package/lib/chevre/repo/order.js

@@ -920,5 +920,34 @@ class MongoRepository {
             return [...new Set(reservationNumbers)];
         });
     }
+    aggregateOrder(params) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.orderModel.aggregate([
+                {
+                    $match: {
+                        orderDate: {
+                            $gte: (_a = params.orderDate) === null || _a === void 0 ? void 0 : _a.$gte,
+                            $lte: (_b = params.orderDate) === null || _b === void 0 ? void 0 : _b.$lte
+                        }
+                    }
+                },
+                {
+                    $group: {
+                        _id: '$typeOf',
+                        acceptedOfferCount: {
+                            $sum: {
+                                $cond: { if: { $isArray: '$acceptedOffers' }, then: { $size: '$acceptedOffers' }, else: 0 }
+                            }
+                        },
+                        orderCount: {
+                            $sum: 1
+                        }
+                    }
+                }
+            ])
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -11,13 +11,10 @@ function createPayActions(params) {
     if (payObject !== undefined) {
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const simpleOrder = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
             // mask
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,
             priceCurrency: params.order.priceCurrency,

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -25,13 +25,28 @@ export interface IStartOperationRepos {
     task: TaskRepo;
 }
 export declare type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
-export declare type ICancelOperation<T> = (repos: {
+export interface ICancelRepos {
+    action: ActionRepo;
+    accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<T>;
-export declare type IConfirmOperation<T> = (repos: {
+    product: ProductRepo;
+    project: ProjectRepo;
+    seller: SellerRepo;
+    task: TaskRepo;
+}
+export declare type ICancelOperation<T> = (repos: ICancelRepos) => Promise<T>;
+export interface IConfirmRepos {
+    action: ActionRepo;
+    accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
+    event: EventRepo;
     order: OrderRepo;
-}) => Promise<T>;
+    product: ProductRepo;
+    project: ProjectRepo;
+    seller: SellerRepo;
+    task: TaskRepo;
+}
+export declare type IConfirmOperation<T> = (repos: IConfirmRepos) => Promise<T>;
 export declare type IExportTasksOperation<T> = (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/assetTransaction/pay.js

@@ -13,6 +13,7 @@ exports.searchGMOTrade = exports.exportTasksById = exports.cancel = exports.conf
 const moment = require("moment");
 const factory = require("../../factory");
 const settings_1 = require("../../settings");
+const payment_1 = require("../payment");
 const CreditCardPayment = require("../payment/creditCard");
 const MovieTicketPayment = require("../payment/movieTicket");
 const PaymentCardPayment = require("../payment/paymentCard");
@@ -307,8 +308,19 @@ function confirm(params) {
             typeOf: factory.assetTransactionType.Pay,
             id: transaction.id,
             result: {},
-            potentialActions: potentialActions
+            // sync対応(2023-01-14~)
+            potentialActions: (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING)
+                ? { pay: [] }
+                : potentialActions
         });
+        // sync対応(2023-01-14~)
+        if (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
+            if (Array.isArray(potentialActions.pay)) {
+                for (const payAction of potentialActions.pay) {
+                    yield (0, payment_1.pay)(payAction)(repos);
+                }
+            }
+        }
     });
 }
 exports.confirm = confirm;
@@ -341,11 +353,23 @@ function fixOrderAsPurpose(params, transaction) {
  */
 function cancel(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield repos.assetTransaction.cancel({
+        const transaction = yield repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.Pay,
             id: params.id,
             transactionNumber: params.transactionNumber
         });
+        // sync対応(2023-01-14~)
+        if (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
+            const payTransactionAsObject = {
+                project: transaction.project,
+                typeOf: transaction.typeOf,
+                id: transaction.id,
+                transactionNumber: transaction.transactionNumber,
+                object: transaction.object,
+                recipient: transaction.recipient
+            };
+            yield (0, payment_1.voidPayment)({ object: payTransactionAsObject })(repos);
+        }
     });
 }
 exports.cancel = cancel;
@@ -353,6 +377,7 @@ exports.cancel = cancel;
  * 取引のタスク出力
  */
 function exportTasksById(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.assetTransaction.findById({
             typeOf: factory.assetTransactionType.Pay,
@@ -388,42 +413,50 @@ function exportTasksById(params) {
                 .add(params.runsTasksAfterInSeconds, 'seconds')
                 .toDate();
         }
+        const payTransactionAsObject = {
+            project: transaction.project,
+            typeOf: transaction.typeOf,
+            id: transaction.id,
+            transactionNumber: transaction.transactionNumber,
+            object: transaction.object,
+            recipient: transaction.recipient
+        };
+        const voidPaymentTasks = {
+            project: transaction.project,
+            name: factory.taskName.VoidPayment,
+            status: factory.taskStatus.Ready,
+            runsAt: taskRunsAt,
+            remainingNumberOfTries: 10,
+            numberOfTried: 0,
+            executionResults: [],
+            data: { object: payTransactionAsObject }
+        };
         switch (transaction.status) {
             case factory.transactionStatusType.Confirmed:
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore else */
-                if (potentialActions !== undefined) {
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore else */
-                    if (potentialActions.pay !== undefined) {
-                        const payTasks = potentialActions.pay.map((a) => {
-                            return {
-                                project: transaction.project,
-                                name: factory.taskName.Pay,
-                                status: factory.taskStatus.Ready,
-                                runsAt: taskRunsAt,
-                                remainingNumberOfTries: 10,
-                                numberOfTried: 0,
-                                executionResults: [],
-                                data: a
-                            };
-                        });
-                        taskAttributes.push(...payTasks);
-                    }
+                const payActions = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.pay;
+                if (Array.isArray(payActions) && payActions.length > 0) {
+                    const payTasks = payActions.map((a) => {
+                        return {
+                            project: transaction.project,
+                            name: factory.taskName.Pay,
+                            status: factory.taskStatus.Ready,
+                            runsAt: taskRunsAt,
+                            remainingNumberOfTries: 10,
+                            numberOfTried: 0,
+                            executionResults: [],
+                            data: a
+                        };
+                    });
+                    taskAttributes.push(...payTasks);
                 }
                 break;
             case factory.transactionStatusType.Canceled:
+                // sync対応(2023-01-14~)
+                if (!settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
+                    taskAttributes.push(voidPaymentTasks);
+                }
+                break;
             case factory.transactionStatusType.Expired:
-                const voidPaymentTasks = {
-                    project: transaction.project,
-                    name: factory.taskName.VoidPayment,
-                    status: factory.taskStatus.Ready,
-                    runsAt: taskRunsAt,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: { object: transaction }
-                };
                 taskAttributes.push(voidPaymentTasks);
                 break;
             default:

package/lib/chevre/service/payment/any.d.ts

@@ -47,7 +47,12 @@ declare function invalidatePaymentUrl(params: factory.task.IData<factory.taskNam
  */
 declare function processVoidPayTransaction(params: factory.task.IData<factory.taskName.VoidPayTransaction>): (repos: {
     action: ActionRepo;
+    accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
+    product: ProductRepo;
+    project: ProjectRepo;
+    seller: SellerRepo;
+    task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
 interface IAuthorizeRepos {

package/lib/chevre/service/task/confirmPayTransaction.js

@@ -10,9 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
+const product_1 = require("../../repo/product");
+const project_1 = require("../../repo/project");
+const seller_1 = require("../../repo/seller");
+const task_1 = require("../../repo/task");
 const PayTransactionService = require("../assetTransaction/pay");
 /**
  * タスク実行関数
@@ -22,6 +28,12 @@ function call(data) {
         const actionRepo = new action_1.MongoRepository(settings.connection);
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         const orderRepo = new order_1.MongoRepository(settings.connection);
+        const accountingReportRepo = new accountingReport_1.MongoRepository(settings.connection);
+        const eventRepo = new event_1.MongoRepository(settings.connection);
+        const productRepo = new product_1.MongoRepository(settings.connection);
+        const projectRepo = new project_1.MongoRepository(settings.connection);
+        const sellerRepo = new seller_1.MongoRepository(settings.connection);
+        const taskRepo = new task_1.MongoRepository(settings.connection);
         // アクション開始
         const action = yield actionRepo.start(data);
         try {
@@ -38,8 +50,15 @@ function call(data) {
                         }
                     }
                 })({
+                    action: actionRepo,
+                    accountingReport: accountingReportRepo,
                     assetTransaction: assetTransactionRepo,
-                    order: orderRepo
+                    event: eventRepo,
+                    order: orderRepo,
+                    product: productRepo,
+                    project: projectRepo,
+                    seller: sellerRepo,
+                    task: taskRepo
                 });
             }
         }

package/lib/chevre/settings.d.ts

@@ -24,6 +24,7 @@ export declare type ISettings = factory.project.ISettings & {
 };
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
+export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 /**
  * グローバル設定
  */

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
+exports.settings = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(',')
@@ -47,6 +47,7 @@ exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = 7;
 exports.DEFAULT_SENDER_EMAIL = process.env.DEFAULT_SENDER_EMAIL;
 exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = String(process.env.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD);
 exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
+exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 /**
  * グローバル設定
  */

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.281.0",
+    "@chevre/factory": "4.282.0-alpha.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.15"
+  "version": "20.2.0-alpha.16"
 }

package/example/src/chevre/aggregateReservationOnProject.ts

@@ -1,32 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: <string>process.env.PROJECT_ID };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    // const now = new Date();
-    await chevre.service.aggregation.project.aggregate({
-        project: { id: project.id },
-        reservationFor: {
-            startFrom: moment('2022-01-01T00:00:00+09:00')
-                .toDate(),
-            startThrough: moment('2022-01-31T23:59:59+09:00')
-                .toDate(),
-        }
-    })({
-        project: new chevre.repository.Project(mongoose.connection),
-        reservation: new chevre.repository.Reservation(mongoose.connection),
-        task: new chevre.repository.Task(mongoose.connection)
-    });
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);