@chevre/domain 21.7.0-alpha.9 → 21.7.0

package/example/src/chevre/countDelayedTasks.ts

@@ -11,7 +11,7 @@ export async function main() {
     const count = await taskRepo.countDelayedTasks({
         delayInSeconds: 60,
         name: {
-            $nin: [chevre.factory.taskName.OrderProgramMembership]
+            $nin: [<any>'orderProgramMembership']
         }
     });
     console.log('count:', count);

package/example/src/chevre/createDeleteTransactionTasks.ts

@@ -0,0 +1,108 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const ONE_YEAR_IN_DAYS = 365;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const now = new Date();
+    const endDateLt: Date = moment(now)
+        // tslint:disable-next-line:no-magic-numbers
+        .add(-ONE_YEAR_IN_DAYS, 'days')
+        .toDate();
+    const startDateLt: Date = moment('2022-01-01T00:00:00Z')
+        .toDate();
+
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+    const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
+
+    const cursor = transactionRepo.getCursor(
+        {
+            typeOf: { $eq: chevre.factory.transactionType.PlaceOrder },
+            startDate: {
+                $lt: startDateLt
+            }
+            // endDate: {
+            //     $exists: true,
+            //     $lt: moment(now)
+            //         // tslint:disable-next-line:no-magic-numbers
+            //         .add(-365, 'days')
+            //         .toDate()
+            // }
+        },
+        {
+            _id: 1,
+            typeOf: 1,
+            project: 1,
+            startDate: 1,
+            endDate: 1,
+            object: 1
+        }
+    );
+    console.log('transactions found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const transaction: Pick<
+            chevre.factory.transaction.placeOrder.ITransaction,
+            'id' | 'project' | 'typeOf' | 'startDate' | 'endDate' | 'object'
+        > = doc.toObject();
+        console.log('checking...', transaction.project.id, transaction.id, transaction.startDate, transaction.endDate, i);
+
+        const isEndDateBefore = transaction.endDate !== undefined && moment(transaction.endDate)
+            .isBefore(endDateLt);
+        if (isEndDateBefore) {
+            const runsAt: Date = moment(transaction.endDate)
+                .add(ONE_YEAR_IN_DAYS, 'days')
+                .toDate();
+
+            updateCount += 1;
+            const deleteTransactionTask: chevre.factory.task.deleteTransaction.IAttributes = {
+                project: transaction.project,
+                name: chevre.factory.taskName.DeleteTransaction,
+                status: chevre.factory.taskStatus.Ready,
+                runsAt,
+                remainingNumberOfTries: 3,
+                numberOfTried: 0,
+                executionResults: [],
+                data: {
+                    object: {
+                        specifyingMethod: chevre.factory.task.deleteTransaction.SpecifyingMethod.Id,
+                        endDate: transaction.endDate,
+                        id: transaction.id,
+                        object: {
+                            ...(typeof transaction.object.confirmationNumber === 'string')
+                                ? { confirmationNumber: transaction.object.confirmationNumber }
+                                : undefined,
+                            ...(typeof transaction.object.orderNumber === 'string')
+                                ? { orderNumber: transaction.object.orderNumber }
+                                : undefined
+                        },
+                        project: transaction.project,
+                        startDate: transaction.startDate,
+                        typeOf: transaction.typeOf
+                    }
+                }
+            };
+            console.log(
+                'saving task...',
+                deleteTransactionTask, transaction.project.id, transaction.id, transaction.startDate, transaction.endDate, i);
+            await taskRepo.saveMany([deleteTransactionTask], { emitImmediately: false });
+            console.log('task saved', transaction.project.id, transaction.id, transaction.startDate, transaction.endDate, i);
+        }
+    });
+
+    console.log(i, 'transactions checked');
+    console.log(updateCount, 'transactions updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/createDeleteTransactionTasksIfNotExist.ts

@@ -0,0 +1,98 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const ONE_YEAR_IN_DAYS = 365;
+type IDeletingTransaction = Pick<
+    chevre.factory.transaction.placeOrder.ITransaction,
+    'id' | 'project' | 'typeOf' | 'startDate' | 'endDate' | 'object'
+>;
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const now = new Date();
+    const endDateLt: Date = moment(now)
+        // tslint:disable-next-line:no-magic-numbers
+        .add(-ONE_YEAR_IN_DAYS, 'days')
+        .toDate();
+
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+    const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
+
+    const deletingTransactions = <IDeletingTransaction[]>await transactionRepo.search<chevre.factory.transactionType.PlaceOrder>(
+        {
+            limit: 100,
+            page: 1,
+            sort: { startDate: chevre.factory.sortType.Ascending },
+            typeOf: chevre.factory.transactionType.PlaceOrder,
+            statuses: [
+                chevre.factory.transactionStatusType.Canceled,
+                chevre.factory.transactionStatusType.Confirmed,
+                chevre.factory.transactionStatusType.Expired
+            ],
+            endThrough: endDateLt,
+            inclusion: ['_id', 'project', 'typeOf', 'startDate', 'endDate', 'object'],
+            exclusion: []
+        }
+    );
+
+    let i = 0;
+    let updateCount = 0;
+    for (const deletingTransaction of deletingTransactions) {
+        i += 1;
+        const transaction: IDeletingTransaction = deletingTransaction;
+        console.log('checking...', transaction.project.id, transaction.id, transaction.startDate, transaction.endDate, i);
+
+        const isEndDateBefore = transaction.endDate !== undefined && moment(transaction.endDate)
+            .isBefore(endDateLt);
+        if (isEndDateBefore) {
+            const runsAt: Date = moment(transaction.endDate)
+                .add(ONE_YEAR_IN_DAYS, 'days')
+                .toDate();
+
+            updateCount += 1;
+            const deleteTransactionTask: chevre.factory.task.deleteTransaction.IAttributes = {
+                project: transaction.project,
+                name: chevre.factory.taskName.DeleteTransaction,
+                status: chevre.factory.taskStatus.Ready,
+                runsAt,
+                remainingNumberOfTries: 3,
+                numberOfTried: 0,
+                executionResults: [],
+                data: {
+                    object: {
+                        specifyingMethod: chevre.factory.task.deleteTransaction.SpecifyingMethod.Id,
+                        endDate: transaction.endDate,
+                        id: transaction.id,
+                        object: {
+                            ...(typeof transaction.object.confirmationNumber === 'string')
+                                ? { confirmationNumber: transaction.object.confirmationNumber }
+                                : undefined,
+                            ...(typeof transaction.object.orderNumber === 'string')
+                                ? { orderNumber: transaction.object.orderNumber }
+                                : undefined
+                        },
+                        project: transaction.project,
+                        startDate: transaction.startDate,
+                        typeOf: transaction.typeOf
+                    }
+                }
+            };
+            console.log(
+                'saving task...',
+                deleteTransactionTask.runsAt, transaction.project.id, transaction.id, transaction.startDate, transaction.endDate, i);
+            await taskRepo.createDeleteTransactionTaskIfNotExist(deleteTransactionTask, { emitImmediately: false });
+            console.log('task saved', transaction.project.id, transaction.id, transaction.startDate, transaction.endDate, i);
+        }
+    }
+
+    console.log(i, 'transactions checked');
+    console.log(updateCount, 'transactions updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/deleteRunsAtPassedCertainPeriod.ts

@@ -0,0 +1,28 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const TASK_STORAGE_PERIOD_IN_DAYS = 365;
+
+async function main() {
+    const now = new Date();
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+
+    const result = await taskRepo.deleteRunsAtPassedCertainPeriod({
+        runsAt: {
+            $lt: moment(now)
+                .add(-TASK_STORAGE_PERIOD_IN_DAYS, 'days')
+                .toDate()
+        }
+    });
+
+    console.log('deleted', result);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/deleteTasksByName.ts

@@ -12,7 +12,7 @@ async function main() {
     const taskRepo = new chevre.repository.Task(mongoose.connection);
 
     const result = await taskRepo.deleteByName({
-        name: chevre.factory.taskName.OrderProgramMembership,
+        name: <any>'orderProgramMembership',
         status: { $eq: chevre.factory.taskStatus.Ready }
         // runsAt: {
         //     $gte: moment('2023-05-20T00:00:00Z')

package/example/src/chevre/migrateAuthorizePaymentActionResult.ts

@@ -46,7 +46,7 @@ async function main() {
             'id' | 'project' | 'result' | 'typeOf' | 'startDate' | 'actionStatus'
         > = doc.toObject();
 
-        const oldPaymentMethodType = action.result?.paymentMethod;
+        const oldPaymentMethodType = (<any>action).result?.paymentMethod;
         const paymentMethodType = action.result?.paymentMethodAsObject?.typeOf;
         const alreadyMigrated = typeof paymentMethodType === 'string' && oldPaymentMethodType === paymentMethodType;
 

package/example/src/chevre/migrateOwnershipInfos2newUserPool.ts

@@ -3,9 +3,12 @@
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
-import { ISS_PREFIX, USERPOOL_ID_NEW } from './checkOrderMembershipTasks';
 import { migrateUser } from './migrateCognitoUser';
 
+// export const USERPOOL_ID_OLD = String(process.env.USERPOOL_ID_OLD);
+export const USERPOOL_ID_NEW = String(process.env.USERPOOL_ID_NEW);
+export const ISS_PREFIX = 'https://cognito-idp.ap-northeast-1.amazonaws.com/';
+
 const project = { id: String(process.env.PROJECT_ID) };
 const PRODUCT_TYPE = chevre.factory.product.ProductType.EventService;
 

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -14,7 +14,7 @@ async function main() {
     let updateResult: any;
     updateResult = await transactionRepo.unsetUnnecessaryFields({
         filter: {
-            'project.id': { $eq: PROJECT_ID },
+            // 'project.id': { $eq: PROJECT_ID },
             typeOf: { $eq: chevre.factory.transactionType.PlaceOrder },
             status: { $eq: chevre.factory.transactionStatusType.Confirmed },
             startDate: {

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

@@ -25,7 +25,7 @@
 import { Schema } from 'mongoose';
 declare const modelName = "Offer";
 /**
- * オファースキーマ
+ * 単価オファースキーマ
  */
 declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     collection: string;
@@ -53,6 +53,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, {
     additionalProperty: any[];
     addOn: any[];
+    availability: string;
     availableAtOrFrom: any[];
     _id?: string | undefined;
     name?: any;
@@ -68,7 +69,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     validFrom?: Date | undefined;
     category?: any;
     advanceBookingRequirement?: any;
-    availability?: string | undefined;
     hasMerchantReturnPolicy?: any;
     priceSpecification?: any;
     eligibleCustomerType?: any;
@@ -84,6 +84,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     additionalProperty: any[];
     addOn: any[];
+    availability: string;
     availableAtOrFrom: any[];
     _id?: string | undefined;
     name?: any;
@@ -99,7 +100,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     validFrom?: Date | undefined;
     category?: any;
     advanceBookingRequirement?: any;
-    availability?: string | undefined;
     hasMerchantReturnPolicy?: any;
     priceSpecification?: any;
     eligibleCustomerType?: any;
@@ -115,6 +115,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }>> & Omit<import("mongoose").FlatRecord<{
     additionalProperty: any[];
     addOn: any[];
+    availability: string;
     availableAtOrFrom: any[];
     _id?: string | undefined;
     name?: any;
@@ -130,7 +131,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     validFrom?: Date | undefined;
     category?: any;
     advanceBookingRequirement?: any;
-    availability?: string | undefined;
     hasMerchantReturnPolicy?: any;
     priceSpecification?: any;
     eligibleCustomerType?: any;

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

@@ -6,7 +6,7 @@ const writeConcern_1 = require("../writeConcern");
 const modelName = 'Offer';
 exports.modelName = modelName;
 /**
- * オファースキーマ
+ * 単価オファースキーマ
  */
 const schema = new mongoose_1.Schema({
     project: mongoose_1.SchemaTypes.Mixed,
@@ -22,14 +22,13 @@ const schema = new mongoose_1.Schema({
     alternateName: mongoose_1.SchemaTypes.Mixed,
     // acceptedPaymentMethod: SchemaTypes.Mixed, // 削除(2023-02-27~)
     addOn: [mongoose_1.SchemaTypes.Mixed],
-    // availableAddOn: SchemaTypes.Mixed, // 削除(2023-02-27~)
-    availability: String,
-    // availabilityEnds: Date, // 削除(2023-02-27~)
-    // availabilityStarts: Date, // 削除(2023-02-27~)
+    availability: {
+        type: String,
+        required: true
+    },
     availableAtOrFrom: [mongoose_1.SchemaTypes.Mixed],
     hasMerchantReturnPolicy: mongoose_1.SchemaTypes.Mixed,
     itemOffered: mongoose_1.SchemaTypes.Mixed,
-    // price: Number, // 削除(2023-02-27~)
     priceCurrency: String,
     priceSpecification: mongoose_1.SchemaTypes.Mixed,
     eligibleCustomerType: mongoose_1.SchemaTypes.Mixed,

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

@@ -50,6 +50,7 @@ export declare class MongoRepository {
         logo?: string;
         name?: string;
         settings?: {
+            sendEmailMessage?: factory.project.ISendEmailMessageSettings;
             sendgridApiKey?: string;
         };
         subscription?: {

package/lib/chevre/repo/project.js

@@ -142,13 +142,19 @@ class MongoRepository {
         });
     }
     findByIdAndIUpdate(params) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.projectModel.findOneAndUpdate({ _id: params.id }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
+            yield this.projectModel.findOneAndUpdate({ _id: params.id }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
                 ? { alternateName: params.alternateName }
-                : undefined), (typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined), (typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined), (typeof ((_a = params.settings) === null || _a === void 0 ? void 0 : _a.sendgridApiKey) === 'string')
+                : undefined), (typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined), (typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined), (typeof ((_c = (_b = (_a = params.settings) === null || _a === void 0 ? void 0 : _a.sendEmailMessage) === null || _b === void 0 ? void 0 : _b.sender) === null || _c === void 0 ? void 0 : _c.email) === 'string')
+                ? {
+                    'settings.sendEmailMessage': {
+                        sender: { email: params.settings.sendEmailMessage.sender.email }
+                    }
+                }
+                : undefined), (typeof ((_d = params.settings) === null || _d === void 0 ? void 0 : _d.sendgridApiKey) === 'string')
                 ? { 'settings.sendgridApiKey': params.settings.sendgridApiKey }
-                : undefined), (typeof ((_b = params.subscription) === null || _b === void 0 ? void 0 : _b.useEventServiceAsProduct) === 'boolean')
+                : undefined), (typeof ((_e = params.subscription) === null || _e === void 0 ? void 0 : _e.useEventServiceAsProduct) === 'boolean')
                 ? { 'subscription.useEventServiceAsProduct': params.subscription.useEventServiceAsProduct }
                 : undefined), { 
                 // ↓customerUserPoolは廃止

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

@@ -31,6 +31,10 @@ export declare class MongoRepository {
         id: string;
     }[]>;
     createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>, options: IOptionOnCreate): Promise<void>;
+    /**
+     * 取引削除タスク冪等作成
+     */
+    createDeleteTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.DeleteTransaction>, options: IOptionOnCreate): Promise<void>;
     executeById(params: {
         id: string;
         executor: {
@@ -63,7 +67,7 @@ export declare class MongoRepository {
              */
             $nin?: factory.taskName[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;
@@ -108,7 +112,7 @@ export declare class MongoRepository {
         runsAt: {
             $lt: Date;
         };
-    }): Promise<void>;
+    }): Promise<import("mongodb").DeleteResult>;
     countDelayedTasks(params: {
         delayInSeconds: number;
         name: {

package/lib/chevre/repo/task.js

@@ -206,6 +206,30 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * 取引削除タスク冪等作成
+     */
+    createDeleteTransactionTaskIfNotExist(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (params.data.object.specifyingMethod !== factory.task.deleteTransaction.SpecifyingMethod.Id) {
+                throw new factory.errors.NotImplemented(`only ${factory.task.deleteTransaction.SpecifyingMethod.Id} implemented`);
+            }
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                'data.object.id': { $exists: true, $eq: params.data.object.id }
+            }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
     executeById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.taskModel.findOneAndUpdate({
@@ -427,7 +451,7 @@ class MongoRepository {
      */
     deleteRunsAtPassedCertainPeriod(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.taskModel.deleteMany({
+            return this.taskModel.deleteMany({
                 runsAt: { $lt: params.runsAt.$lt },
                 status: { $in: [factory.taskStatus.Aborted, factory.taskStatus.Executed] }
             })

package/lib/chevre/repo/transaction.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';
 interface IAggregationByStatus {
@@ -98,7 +122,6 @@ export declare class MongoRepository {
     confirm<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
-        authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
         result: factory.transaction.IResult<T>;
         potentialActions: factory.transaction.IPotentialActions<T>;
     }): Promise<void>;
@@ -194,6 +217,7 @@ export declare class MongoRepository {
         filter: any;
         $unset: any;
     }): Promise<import("mongodb").UpdateResult>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     aggregatePlaceOrder(params: {
         project?: {
             id?: {

package/lib/chevre/repo/transaction.js

@@ -438,7 +438,7 @@ class MongoRepository {
             }, {
                 status: factory.transactionStatusType.Confirmed,
                 endDate: new Date(),
-                'object.authorizeActions': params.authorizeActions,
+                // 'object.authorizeActions': params.authorizeActions,
                 result: params.result,
                 potentialActions: params.potentialActions // resultを更新
             }, {
@@ -776,6 +776,11 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.transactionModel.find(conditions, projection)
+            .sort({ startDate: factory.sortType.Descending })
+            .cursor();
+    }
     aggregatePlaceOrder(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

package/lib/chevre/service/notification.js

@@ -24,8 +24,9 @@ const debug = createDebug('chevre-domain:service');
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
  */
 function sendEmailMessage(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const project = yield repos.project.findById({
             id: params.project.id,
             inclusion: ['_id', 'settings'],
@@ -45,6 +46,15 @@ function sendEmailMessage(params) {
             }
             sgMail.setApiKey(apiKey);
             const emailMessage = params.object;
+            const emailMessageFrom = {
+                name: emailMessage.sender.name,
+                email: emailMessage.sender.email
+            };
+            // プロジェクト設定対応(2023-08-21~)
+            const senderEmailByProjectSettings = (_d = (_c = (_b = project.settings) === null || _b === void 0 ? void 0 : _b.sendEmailMessage) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email;
+            if (typeof senderEmailByProjectSettings === 'string' && senderEmailByProjectSettings.length > 0) {
+                emailMessageFrom.email = senderEmailByProjectSettings;
+            }
             let subject;
             // 互換性維持対応として、String型に対応
             if (typeof emailMessage.about === 'string') {
@@ -52,7 +62,7 @@ function sendEmailMessage(params) {
                     subject = String(emailMessage.about);
                 }
             }
-            else if (typeof ((_b = emailMessage.about) === null || _b === void 0 ? void 0 : _b.name) === 'string') {
+            else if (typeof ((_e = emailMessage.about) === null || _e === void 0 ? void 0 : _e.name) === 'string') {
                 if (emailMessage.about.name.length > 0) {
                     subject = emailMessage.about.name;
                 }
@@ -69,10 +79,7 @@ function sendEmailMessage(params) {
                         name: emailMessage.toRecipient.name,
                         email: emailMessage.toRecipient.email
                     }];
-            const msg = Object.assign(Object.assign(Object.assign({ to: emailDatas, from: {
-                    name: emailMessage.sender.name,
-                    email: emailMessage.sender.email
-                } }, (typeof subject === 'string') ? { subject } : undefined), (String(emailMessage.text).length > 0) ? { text: String(emailMessage.text) } : undefined), { 
+            const msg = Object.assign(Object.assign(Object.assign({ to: emailDatas, from: emailMessageFrom }, (typeof subject === 'string') ? { subject } : undefined), (String(emailMessage.text).length > 0) ? { text: String(emailMessage.text) } : undefined), { 
                 // html: '<strong>and easy to do anywhere, even with Node.js</strong>',
                 // categories: ['Transactional', 'My category'],
                 // 送信予定を追加することもできるが、タスクの実行予定日時でコントロールする想定

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

@@ -20,4 +20,24 @@ export declare function createConfirmReservationActionObject4COAByOrder(params:
 export declare function createConfirmRegisterServiceActionObjectByOrder(params: {
     order: factory.order.IOrder;
 }): factory.action.interact.confirm.registerService.IObject[];
+export type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
+/**
+ * 注文作成後のアクション
+ */
+export declare function createOnPlaceOrderTasksByTransaction(params: {
+    object: factory.order.IOrder | IExternalOrder;
+    potentialActions?: factory.action.trade.order.IPotentialActions;
+}): factory.task.IAttributes<factory.taskName>[];
+/**
+ * 注文配送後のアクション
+ */
+export declare function createOnOrderSentTasksByTransaction(params: {
+    potentialActions?: factory.action.transfer.send.order.IPotentialActions;
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+/**
+ * 注文返品後のアクション
+ */
+export declare function createOnOrderReturnedTasksByTransaction(params: {
+    potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export {};