@chevre/domain 22.14.0-alpha.7 → 22.14.0-alpha.8

package/lib/chevre/repo/task.js

@@ -306,8 +306,8 @@ class TaskRepo {
     // resolve uniqueness of identifier(2025-03-27~)
     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`);
+            if (params.data.object.specifyingMethod !== factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
+                throw new factory.errors.NotImplemented(`only ${factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id} implemented`);
             }
             const createdTask = yield this.taskModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },

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

@@ -95,17 +95,18 @@ function deleteById(params, setting) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
+        const deleteObject = {
+            id: params.id,
+            typeOf: factory.personType.Person,
+            migrate: params.migrate,
+            physically: params.physically
+            // discontinue(2025-03-29~)
+            // ...(typeof params.migratePersonRecipientUrl === 'string')
+            //     ? { migratePersonRecipientUrl: params.migratePersonRecipientUrl } : undefined
+        };
         const deleteMemberAction = {
             agent: params.agent,
-            object: {
-                id: params.id,
-                typeOf: factory.personType.Person,
-                migrate: params.migrate,
-                physically: params.physically
-                // discontinue(2025-03-29~)
-                // ...(typeof params.migratePersonRecipientUrl === 'string')
-                //     ? { migratePersonRecipientUrl: params.migratePersonRecipientUrl } : undefined
-            },
+            object: deleteObject,
             project: { id: params.project.id, typeOf: factory.organizationType.Project },
             typeOf: factory.actionType.DeleteAction
         };
@@ -386,7 +387,7 @@ function createDeleteTransactionTask(params) {
                 executionResults: [],
                 data: {
                     object: {
-                        specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.AgentId,
+                        specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId,
                         agent: { id: params.id },
                         project: { id: params.project.id },
                         typeOf: transactionType

package/lib/chevre/service/transaction/deleteTransaction.js

@@ -19,7 +19,7 @@ const deleteOrder_1 = require("../order/deleteOrder");
 function deleteTransaction(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        if (params.object.specifyingMethod === factory.task.deleteTransaction.SpecifyingMethod.AgentId) {
+        if (params.object.specifyingMethod === factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId) {
             // transaction.agent.id指定による取引削除に対応(2023-06-30~)
             yield createDeleteTransactionTasksByAgentId(params)(repos);
         }
@@ -31,8 +31,8 @@ function deleteTransaction(params) {
 function createDeleteTransactionTasksByAgentId(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        if (params.object.specifyingMethod !== factory.task.deleteTransaction.SpecifyingMethod.AgentId) {
-            throw new factory.errors.Argument('object.specifyingMethod', `must be ${factory.task.deleteTransaction.SpecifyingMethod.Id}`);
+        if (params.object.specifyingMethod !== factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId) {
+            throw new factory.errors.Argument('object.specifyingMethod', `must be ${factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId}`);
         }
         const agentIdSpecified = params.object.agent.id;
         // agentIdによる全取引についてDeleteTransactionタスクを作成する
@@ -61,7 +61,7 @@ function createDeleteTransactionTasksByAgentId(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
+                                object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
                                         ? { confirmationNumber: transaction.object.confirmationNumber }
                                         : undefined), (typeof transaction.object.orderNumber === 'string')
                                         ? { orderNumber: transaction.object.orderNumber }
@@ -81,7 +81,7 @@ function createDeleteTransactionTasksByAgentId(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: {
+                                object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: {
                                         order: transaction.object.order
                                     }, project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
                             }
@@ -99,7 +99,7 @@ function createDeleteTransactionTasksByAgentId(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
+                                object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
                                         ? { pendingTransaction: transaction.object.pendingTransaction }
                                         : undefined), project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
                             }
@@ -120,8 +120,8 @@ function deleteTransactionById(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         if (typeof params.object.specifyingMethod === 'string'
-            && params.object.specifyingMethod !== factory.task.deleteTransaction.SpecifyingMethod.Id) {
-            throw new factory.errors.Argument('object.specifyingMethod', `must be ${factory.task.deleteTransaction.SpecifyingMethod.Id}`);
+            && params.object.specifyingMethod !== factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
+            throw new factory.errors.Argument('object.specifyingMethod', `must be ${factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id}`);
         }
         const deletingTransactionId = params.object.id;
         if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
@@ -364,7 +364,7 @@ function deleteMessagesByPlaceOrder(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let deleteResult;
         if (params.transaction.typeOf === factory.transactionType.PlaceOrder
-            && params.transaction.specifyingMethod === factory.task.deleteTransaction.SpecifyingMethod.Id) {
+            && params.transaction.specifyingMethod === factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
             const orderNumber = params.transaction.object.orderNumber;
             if (typeof orderNumber === 'string' && orderNumber.length > 0) {
                 const deleteReservationsResult = yield repos.message.deleteByMainEntityOrderNumber({

package/lib/chevre/service/transaction/moneyTransfer/exportTasks/factory.js

@@ -53,7 +53,7 @@ function createTasks(params, setting
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
+            object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
                     ? { pendingTransaction: transaction.object.pendingTransaction }
                     : undefined), project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
         }

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -87,7 +87,7 @@ function createTasks(params, setting
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
+            object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
                     ? { confirmationNumber: transaction.object.confirmationNumber }
                     : undefined), (typeof transaction.object.orderNumber === 'string')
                     ? { orderNumber: transaction.object.orderNumber }

package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.js

@@ -53,7 +53,7 @@ function createTasks(params, setting
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: {
+            object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: {
                     order: transaction.object.order
                 }, project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
         }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.399.0-alpha.6",
+    "@chevre/factory": "4.399.0-alpha.8",
     "@cinerino/sdk": "12.2.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.14.0-alpha.7"
+  "version": "22.14.0-alpha.8"
 }

package/example/src/chevre/migrateDeleteTransactionTasks.ts

@@ -1,132 +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) };
-const STORAGE_PERIOD_IN_DAYS = 30;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
-    const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
-
-    const cursor = taskRepo.getCursor(
-        {
-            name: { $eq: chevre.factory.taskName.DeleteTransaction },
-            status: { $eq: chevre.factory.taskStatus.Ready }
-            // runsAt: {
-            //     $gte: moment()
-            //         // tslint:disable-next-line:no-magic-numbers
-            //         .add(29, 'days')
-            //         .toDate(),
-            //     $lte: moment()
-            //         // tslint:disable-next-line:no-magic-numbers
-            //         .add(365, 'days')
-            //         .toDate()
-            // },
-            // _id: { $eq: '6440d8cf9e4983c32ade65de' }
-        },
-        {
-            _id: 1,
-            project: 1,
-            data: 1,
-            status: 1,
-            name: 1,
-            runsAt: 1
-        }
-    );
-    console.log('tasks found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const deleteTransactionTask: Pick<
-            chevre.factory.task.deleteTransaction.ITask,
-            'id' | 'project' | 'data' | 'status' | 'name' | 'runsAt'
-        > = doc.toObject();
-
-        let placeOrderTransactionId: string | undefined;
-        if (deleteTransactionTask.data.object.typeOf === chevre.factory.transactionType.PlaceOrder) {
-            if (
-                (typeof deleteTransactionTask.data.object.specifyingMethod !== 'string')
-                || (deleteTransactionTask.data.object.specifyingMethod === chevre.factory.task.deleteTransaction.SpecifyingMethod.Id)
-            ) {
-                placeOrderTransactionId = deleteTransactionTask.data.object.id;
-            }
-        }
-
-        let alreadyMigrated = true;
-        let runsAtExpected: moment.Moment | undefined;
-        if (typeof placeOrderTransactionId === 'string') {
-            console.log(
-                'checking transaction...',
-                deleteTransactionTask.project.id, deleteTransactionTask.name, deleteTransactionTask.id, deleteTransactionTask.runsAt,
-                placeOrderTransactionId
-            );
-            const placeOrderTransaction = (await transactionRepo.projectFields({
-                limit: 1,
-                page: 1,
-                typeOf: chevre.factory.transactionType.PlaceOrder,
-                ids: [placeOrderTransactionId],
-                inclusion: ['endDate', 'status']
-            })).shift();
-            if (placeOrderTransaction !== undefined) {
-                const { endDate, status } = placeOrderTransaction;
-                runsAtExpected = moment(endDate)
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(STORAGE_PERIOD_IN_DAYS, 'days');
-
-                // if (status !== chevre.factory.transactionStatusType.Confirmed) {
-                const taskRunsTooLate = moment(deleteTransactionTask.runsAt)
-                    .isAfter(runsAtExpected);
-                const diff = moment(deleteTransactionTask.runsAt)
-                    .diff(moment(endDate));
-                console.log('taskRunsTooLate?:', taskRunsTooLate, placeOrderTransactionId, endDate, status, diff.toLocaleString());
-                if (taskRunsTooLate) {
-                    alreadyMigrated = false;
-                }
-                // }
-            }
-        }
-
-        if (alreadyMigrated) {
-            console.log(
-                'already migrated.',
-                deleteTransactionTask.project.id, deleteTransactionTask.name, deleteTransactionTask.id, deleteTransactionTask.runsAt,
-                i, updateCount);
-        } else {
-            console.log(
-                'updating...',
-                deleteTransactionTask.project.id, deleteTransactionTask.name, deleteTransactionTask.id, deleteTransactionTask.runsAt,
-                i, updateCount, runsAtExpected);
-            if (runsAtExpected !== undefined) {
-                await taskRepo.taskModel.findByIdAndUpdate(
-                    deleteTransactionTask.id,
-                    {
-                        $set: {
-                            runsAt: runsAtExpected.toDate()
-                        }
-                    }
-                )
-                    .exec();
-            }
-            updateCount += 1;
-            console.log(
-                'updated.',
-                deleteTransactionTask.project.id, deleteTransactionTask.name, deleteTransactionTask.id, deleteTransactionTask.runsAt,
-                i, updateCount, runsAtExpected);
-        }
-    });
-
-    console.log(i, 'tasks checked');
-    console.log(updateCount, 'tasks updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/optimizeDeleteTransactionTasks.ts

@@ -1,119 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
-
-    const cursor = taskRepo.getCursor(
-        {
-            name: { $eq: chevre.factory.taskName.DeleteTransaction },
-            status: { $eq: chevre.factory.taskStatus.Ready }
-            // runsAt: {
-            //     $gte: moment()
-            //         // tslint:disable-next-line:no-magic-numbers
-            //         .add(29, 'days')
-            //         .toDate(),
-            //     $lte: moment()
-            //         // tslint:disable-next-line:no-magic-numbers
-            //         .add(365, 'days')
-            //         .toDate()
-            // },
-            // _id: { $eq: '6441bcf04014af2c7d39f6aa' }
-        },
-        {
-            _id: 1,
-            project: 1,
-            data: 1,
-            status: 1,
-            name: 1,
-            runsAt: 1
-        }
-    );
-    console.log('tasks found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const deleteTransactionTask: Pick<
-            chevre.factory.task.deleteTransaction.ITask,
-            'id' | 'project' | 'data' | 'status' | 'name' | 'runsAt'
-        > = doc.toObject();
-
-        let dataObject: chevre.factory.task.deleteTransaction.IObjectAsPlaceOrder | undefined;
-        if (deleteTransactionTask.data.object.typeOf === chevre.factory.transactionType.PlaceOrder) {
-            if (
-                (typeof deleteTransactionTask.data.object.specifyingMethod !== 'string')
-                || (deleteTransactionTask.data.object.specifyingMethod === chevre.factory.task.deleteTransaction.SpecifyingMethod.Id)
-            ) {
-                const existingDataObject = deleteTransactionTask.data.object;
-                if ((<any>existingDataObject).agent !== undefined) {
-                    dataObject = {
-                        specifyingMethod: chevre.factory.task.deleteTransaction.SpecifyingMethod.Id,
-                        id: existingDataObject.id,
-                        object: {
-                            ...(typeof existingDataObject.object.confirmationNumber === 'string')
-                                ? { confirmationNumber: existingDataObject.object.confirmationNumber }
-                                : undefined,
-                            ...(typeof existingDataObject.object.orderNumber === 'string')
-                                ? { orderNumber: existingDataObject.object.orderNumber }
-                                : undefined
-                        },
-                        project: existingDataObject.project,
-                        startDate: existingDataObject.startDate,
-                        typeOf: existingDataObject.typeOf,
-                        ...(existingDataObject.endDate !== undefined) ? { endDate: existingDataObject.endDate } : undefined
-                    };
-                }
-            }
-        }
-
-        let alreadyMigrated = true;
-        if (typeof dataObject?.id === 'string') {
-            alreadyMigrated = false;
-        }
-
-        if (alreadyMigrated) {
-            console.log(
-                'already migrated.',
-                deleteTransactionTask.project.id, deleteTransactionTask.name, deleteTransactionTask.id, deleteTransactionTask.runsAt,
-                i, updateCount);
-        } else {
-            console.log(
-                'updating...',
-                deleteTransactionTask.project.id, deleteTransactionTask.name, deleteTransactionTask.id, deleteTransactionTask.runsAt,
-                i, updateCount, dataObject);
-            if (dataObject !== undefined) {
-                await taskRepo.taskModel.findByIdAndUpdate(
-                    deleteTransactionTask.id,
-                    {
-                        $set: {
-                            'data.object': dataObject
-                        }
-                    },
-                    { timestamps: false }
-                )
-                    .exec();
-            }
-            updateCount += 1;
-            console.log(
-                'updated.',
-                deleteTransactionTask.project.id, deleteTransactionTask.name, deleteTransactionTask.id, deleteTransactionTask.runsAt,
-                i, updateCount);
-        }
-    });
-
-    console.log(i, 'tasks checked');
-    console.log(updateCount, 'tasks updated');
-}
-
-main()
-    .then()
-    .catch(console.error);