@chevre/domain 21.2.0-alpha.16 → 21.2.0-alpha.161

package/example/src/chevre/transaction/processReturnOrder.ts

@@ -0,0 +1,40 @@
+// tslint:disable:no-console
+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, { autoIndex: false });
+
+    const result = await chevre.service.transaction.returnOrder.start({
+        project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+        expiresInSeconds: 60,
+        agent: { id: 'xxx', typeOf: chevre.factory.creativeWorkType.WebApplication },
+        object: {
+            order: [{
+                confirmationNumber: '99916',
+                orderNumber: 'TTT2-8507485-9273468'
+            }],
+            reason: chevre.factory.transaction.returnOrder.Reason.Customer
+        },
+        seller: {
+            id: 'xxx'
+        }
+    })({
+        event: new chevre.repository.Event(mongoose.connection),
+        merchantReturnPolicy: new chevre.repository.MerchantReturnPolicy(mongoose.connection),
+        offer: new chevre.repository.Offer(mongoose.connection),
+        offerItemCondition: new chevre.repository.OfferItemCondition(mongoose.connection),
+        order: new chevre.repository.Order(mongoose.connection),
+        reservation: new chevre.repository.Reservation(mongoose.connection),
+        seller: new chevre.repository.Seller(mongoose.connection),
+        transaction: new chevre.repository.Transaction(mongoose.connection)
+    });
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/transaction/startExportTasks.ts

@@ -9,7 +9,8 @@ async function main() {
     const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
     const result = await transactionRepo.startExportTasks({
         typeOf: { $in: [chevre.factory.transactionType.PlaceOrder] },
-        status: chevre.factory.transactionStatusType.Confirmed
+        status: chevre.factory.transactionStatusType.Confirmed,
+        tasksExportAction: { agent: { name: 'xxx' } }
     });
     console.log(result);
 }

package/example/src/chevre/unsetContainsInPlaceFromMovieTheater.ts

@@ -0,0 +1,41 @@
+// tslint:disable:no-console
+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, { autoIndex: false });
+
+    const placeRepo = new chevre.repository.Place(mongoose.connection);
+
+    const cursor = placeRepo.getCursor(
+        {
+            typeOf: { $eq: chevre.factory.placeType.MovieTheater }
+        },
+        {
+            _id: 1,
+            name: 1,
+            project: 1,
+            typeOf: 1
+        }
+    );
+    console.log('places found');
+
+    let i = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const { id, name, project, typeOf } = <Pick<chevre.factory.place.movieTheater.IPlace, 'id' | 'name' | 'project' | 'typeOf'>>
+            doc.toObject();
+
+        console.log('unset processing...', project.id, typeOf, id, name.ja, i);
+        const result = await placeRepo.unsetContainsPlaceFromMovieTheater({ id });
+        console.log('unset processed.', project.id, typeOf, id, name.ja, result?.id, i);
+    });
+
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/updateTransaction.ts

@@ -14,7 +14,7 @@ async function main() {
     };
 
     let now = moment();
-    await transactionRepo.findByIdAndUpdate({
+    await transactionRepo.findByIdAndUpdateInProgress({
         id: transactionId,
         update
     });

package/example/src/playOnMoment.ts

@@ -0,0 +1,24 @@
+// tslint:disable:no-console
+import * as moment from 'moment-timezone';
+
+const startDate = moment('2023-05-27T00:00:00Z')
+    .toDate();
+const gracePeriodBeforeStartInDaysMin = {
+    timezone: 'Asia/Tokyo',
+    time: '09:38:00',
+    period: { value: 3 }
+};
+const returningDate = new Date();
+
+const minDate: string = moment(startDate)
+    .tz(gracePeriodBeforeStartInDaysMin.timezone)
+    .startOf('days')
+    .subtract(gracePeriodBeforeStartInDaysMin.period.value, 'days')
+    .format('YYYY-MM-DD');
+console.log('minDate:', minDate);
+
+const returnMaxDate = moment(`${minDate}T${gracePeriodBeforeStartInDaysMin.time}`)
+    .tz(gracePeriodBeforeStartInDaysMin.timezone);
+console.log(returnMaxDate);
+
+console.log(returnMaxDate.isSameOrAfter(moment(returningDate)));

package/lib/chevre/credentials.d.ts

@@ -27,6 +27,7 @@ export declare const credentials: {
     lineNotify: {
         url: string;
         accessToken: string;
+        accessTokenAlert: string;
     };
     movieticketReserve: {
         timeout: number;

package/lib/chevre/credentials.js

@@ -31,7 +31,8 @@ exports.credentials = {
     },
     lineNotify: {
         url: process.env.LINE_NOTIFY_URL,
-        accessToken: process.env.LINE_NOTIFY_ACCESS_TOKEN
+        accessToken: process.env.LINE_NOTIFY_ACCESS_TOKEN,
+        accessTokenAlert: process.env.LINE_NOTIFY_ACCESS_TOKEN_ALERT
     },
     movieticketReserve: {
         // tslint:disable-next-line:no-magic-numbers

package/lib/chevre/eventEmitter/assetTransaction.d.ts

@@ -0,0 +1,21 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+import * as factory from '../factory';
+interface IListenArgsOnAssetTransactionStatusChanged {
+    /**
+     * 取引ID
+     */
+    id: string;
+    typeOf: factory.assetTransactionType;
+    status: factory.transactionStatusType;
+}
+type IOnAssetTransactionStatusChangedListener = (listenArgs: IListenArgsOnAssetTransactionStatusChanged) => void;
+/**
+ * 資産取引イベントエミッター
+ */
+declare class AssetTransactionEventEmitter extends EventEmitter {
+    onAssetTransactionStatusChanged(listner: IOnAssetTransactionStatusChangedListener): void;
+    emitAssetTransactionStatusChanged(args: IListenArgsOnAssetTransactionStatusChanged): void;
+}
+declare const assetTransactionEventEmitter: AssetTransactionEventEmitter;
+export { IListenArgsOnAssetTransactionStatusChanged, assetTransactionEventEmitter };

package/lib/chevre/eventEmitter/assetTransaction.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assetTransactionEventEmitter = void 0;
+const events_1 = require("events");
+var EventName;
+(function (EventName) {
+    EventName["OnAssetTransactionStatusChanged"] = "OnAssetTransactionStatusChanged";
+})(EventName || (EventName = {}));
+/**
+ * 資産取引イベントエミッター
+ */
+class AssetTransactionEventEmitter extends events_1.EventEmitter {
+    onAssetTransactionStatusChanged(listner) {
+        this.on(EventName.OnAssetTransactionStatusChanged, listner);
+    }
+    emitAssetTransactionStatusChanged(args) {
+        this.emit(EventName.OnAssetTransactionStatusChanged, args);
+    }
+}
+const assetTransactionEventEmitter = new AssetTransactionEventEmitter();
+exports.assetTransactionEventEmitter = assetTransactionEventEmitter;
+assetTransactionEventEmitter.on('error', (err) => {
+    // tslint:disable-next-line:no-console
+    console.error('assetTransactionEventEmitter listened an error.', err);
+});

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

@@ -3,6 +3,7 @@ import { EventEmitter } from 'events';
 import * as factory from '../factory';
 interface IListenArgsOnTaskStatusChanged {
     id: string;
+    name?: factory.taskName;
     status: factory.taskStatus;
 }
 type IOnTaskStatusChangedListener = (listenArgs: IListenArgsOnTaskStatusChanged) => void;
@@ -14,4 +15,4 @@ declare class TaskEventEmitter extends EventEmitter {
     emitTaskStatusChanged(args: IListenArgsOnTaskStatusChanged): void;
 }
 declare const taskEventEmitter: TaskEventEmitter;
-export { taskEventEmitter };
+export { IOnTaskStatusChangedListener, taskEventEmitter };

package/lib/chevre/eventEmitter/task.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskEventEmitter = void 0;
 const events_1 = require("events");
-const settings_1 = require("../settings");
 var EventName;
 (function (EventName) {
     EventName["OnTaskStatusChanged"] = "OnTaskStatusChanged";
@@ -15,9 +14,7 @@ class TaskEventEmitter extends events_1.EventEmitter {
         this.on(EventName.OnTaskStatusChanged, listner);
     }
     emitTaskStatusChanged(args) {
-        if (settings_1.USE_EVENT_EMITTERS) {
-            this.emit(EventName.OnTaskStatusChanged, args);
-        }
+        this.emit(EventName.OnTaskStatusChanged, args);
     }
 }
 const taskEventEmitter = new TaskEventEmitter();

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

@@ -18,4 +18,4 @@ declare class TransactionEventEmitter extends EventEmitter {
     emitTransactionStatusChanged(args: IListenArgsOnTransactionStatusChanged): void;
 }
 declare const transactionEventEmitter: TransactionEventEmitter;
-export { transactionEventEmitter };
+export { IListenArgsOnTransactionStatusChanged, transactionEventEmitter };

package/lib/chevre/eventEmitter/transaction.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transactionEventEmitter = void 0;
 const events_1 = require("events");
-const settings_1 = require("../settings");
 var EventName;
 (function (EventName) {
     EventName["OnTransactionStatusChanged"] = "OnTransactionStatusChanged";
@@ -15,9 +14,7 @@ class TransactionEventEmitter extends events_1.EventEmitter {
         this.on(EventName.OnTransactionStatusChanged, listner);
     }
     emitTransactionStatusChanged(args) {
-        if (settings_1.USE_EVENT_EMITTERS) {
-            this.emit(EventName.OnTransactionStatusChanged, args);
-        }
+        this.emit(EventName.OnTransactionStatusChanged, args);
     }
 }
 const transactionEventEmitter = new TransactionEventEmitter();

package/lib/chevre/eventEmitter.d.ts

@@ -1,3 +1,4 @@
+import { assetTransactionEventEmitter } from './eventEmitter/assetTransaction';
 import { taskEventEmitter } from './eventEmitter/task';
 import { transactionEventEmitter } from './eventEmitter/transaction';
-export { taskEventEmitter as task, transactionEventEmitter as transaction };
+export { assetTransactionEventEmitter as assetTransaction, taskEventEmitter as task, transactionEventEmitter as transaction };

package/lib/chevre/eventEmitter.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transaction = exports.task = void 0;
+exports.transaction = exports.task = exports.assetTransaction = void 0;
+const assetTransaction_1 = require("./eventEmitter/assetTransaction");
+Object.defineProperty(exports, "assetTransaction", { enumerable: true, get: function () { return assetTransaction_1.assetTransactionEventEmitter; } });
 const task_1 = require("./eventEmitter/task");
 Object.defineProperty(exports, "task", { enumerable: true, get: function () { return task_1.taskEventEmitter; } });
 const transaction_1 = require("./eventEmitter/transaction");

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

@@ -1,6 +1,9 @@
 import * as factory from '../factory';
 export declare const AWARD_ACCOUNTS_IDENTIFIER_NAME = "awardAccounts";
+export type IMaskedCustomer = factory.order.ICustomer | Pick<factory.order.ICustomer, 'id' | 'typeOf'>;
 /**
  * 個人情報のマスクされたカスタマーを作成する
  */
-export declare function createMaskedCustomer(order: Pick<factory.order.IOrder, 'customer'>): factory.order.ICustomer;
+export declare function createMaskedCustomer(order: Pick<factory.order.IOrder, 'customer'>, options: {
+    noProfile: boolean;
+}): IMaskedCustomer;

package/lib/chevre/factory/order.js

@@ -6,11 +6,24 @@ const MASKED_PROFILE = '****';
 /**
  * 個人情報のマスクされたカスタマーを作成する
  */
-function createMaskedCustomer(order) {
-    return Object.assign(Object.assign({}, order.customer), { 
-        // ↓identifierも隠蔽
-        identifier: [], 
-        // ↓additionalPropertyも隠蔽
-        additionalProperty: [], email: MASKED_PROFILE, telephone: MASKED_PROFILE, name: MASKED_PROFILE, familyName: MASKED_PROFILE, givenName: MASKED_PROFILE });
+function createMaskedCustomer(order, options) {
+    // noProfileに対応する(2023-07-03~)
+    if ((options === null || options === void 0 ? void 0 : options.noProfile) === true) {
+        return {
+            id: order.customer.id,
+            typeOf: order.customer.typeOf
+            // ↓identifierも隠蔽
+            // identifier: [],
+            // ↓additionalPropertyも隠蔽
+            // additionalProperty: [],
+        };
+    }
+    else {
+        return Object.assign(Object.assign({}, order.customer), { 
+            // ↓identifierも隠蔽
+            identifier: [], 
+            // ↓additionalPropertyも隠蔽
+            additionalProperty: [], email: MASKED_PROFILE, telephone: MASKED_PROFILE, name: MASKED_PROFILE, familyName: MASKED_PROFILE, givenName: MASKED_PROFILE });
+    }
 }
 exports.createMaskedCustomer = createMaskedCustomer;

package/lib/chevre/repo/account.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const account_1 = require("./mongoose/schemas/account");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * 口座リポジトリ
  */
@@ -390,7 +391,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.accountModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -419,7 +420,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.openDate) !== undefined) {
                 query.sort({ openDate: params.sort.openDate });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

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

@@ -46,7 +46,9 @@ export declare class MongoRepository {
      * 取引を期限切れにする
      */
     makeExpired(params: {
-        expires: Date;
+        expires: {
+            $lt: Date;
+        };
     }): Promise<void>;
     /**
      * 取引を検索する

package/lib/chevre/repo/accountTransaction.js

@@ -13,6 +13,7 @@ exports.MongoRepository = void 0;
 const moment = require("moment");
 const accountTransaction_1 = require("./mongoose/schemas/accountTransaction");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * 口座取引リポジトリ
  */
@@ -229,7 +230,7 @@ class MongoRepository {
             // ステータスと期限を見て更新
             yield this.transactionModel.updateMany({
                 status: factory.transactionStatusType.InProgress,
-                expires: { $lt: params.expires }
+                expires: { $lt: params.expires.$lt }
             }, {
                 status: factory.transactionStatusType.Expired,
                 endDate: new Date()
@@ -260,7 +261,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.startDate) !== undefined) {
                 query.sort({ startDate: params.sort.startDate });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

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

@@ -1,8 +1,6 @@
 import { Connection, Model } from 'mongoose';
 import * as factory from '../factory';
-export type IOrder4report = factory.order.IOrder & {
-    numItems: number;
-};
+export type IOrder4report = factory.report.accountingReport.IOrderAsMainEntity;
 export interface IAccountingReport {
     project: {
         id: string;

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
@@ -61,6 +85,18 @@ export declare class MongoRepository {
         id: string;
         error: any;
     }): Promise<IAction<T>>;
+    /**
+     * 一定期間ActiveActionStatusのアクションをFailedActionStatusにする
+     */
+    giveUpStartDatePassedCertainPeriod(params: {
+        id?: {
+            $eq?: string;
+        };
+        error: any;
+        startDate: {
+            $lt: Date;
+        };
+    }): Promise<any>;
     findById<T extends factory.actionType>(params: {
         typeOf: T;
         id: string;
@@ -82,7 +118,18 @@ export declare class MongoRepository {
         typeOf?: T;
         purpose: {
             typeOf: factory.transactionType;
-            id?: string;
+            id: string;
+        };
+        object?: {
+            typeOf?: {
+                $eq?: factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment;
+            };
+            paymentMethodId?: {
+                $eq?: string;
+            };
+        };
+        actionStatus?: {
+            $eq?: factory.actionStatusType;
         };
         sort?: factory.action.ISortOrder;
     }): Promise<IAction<T>[]>;
@@ -122,6 +169,23 @@ export declare class MongoRepository {
     deleteEndDatePassedCertainPeriod(params: {
         $lt: Date;
     }): Promise<void>;
+    /**
+     * 取引からアクションを削除する
+     */
+    deleteByPurpose(params: {
+        project: {
+            id: string;
+        };
+        purpose: {
+            typeOf: factory.transactionType;
+            id: string;
+        };
+        typeOf: {
+            $in: factory.actionType[];
+        };
+    }): Promise<{
+        deletedCount?: number;
+    } | null>;
     aggregateAuthorizeEventServiceOfferAction(params: {
         project?: {
             id?: {
@@ -152,7 +216,19 @@ export declare class MongoRepository {
         startThrough: Date;
         typeOf: factory.actionType;
     }): Promise<IAggregateAction>;
-    aggregateUseAction(params: {
+    aggregateCancelReservationAction(params: {
+        project?: {
+            id?: {
+                $ne?: string;
+            };
+        };
+        startFrom: Date;
+        startThrough: Date;
+    }): Promise<IAggregateAction>;
+    /**
+     * アクションタイプによる汎用的な集計
+     */
+    aggregateByTypeOf(params: {
         project?: {
             id?: {
                 $ne?: string;
@@ -180,6 +256,7 @@ export declare class MongoRepository {
         startFrom: Date;
         startThrough: Date;
     }): Promise<IAggregateAction>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     private agggregateByStatus;
 }
 export {};