@chevre/domain 22.14.0-alpha.0 → 22.14.0-alpha.10

package/example/src/chevre/note/upsertNotesByIdentifier.ts

@@ -0,0 +1,58 @@
+// tslint:disable:no-console no-magic-numbers
+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 noteRepo = await chevre.repository.Note.createInstance(mongoose.connection);
+
+    const creatingNote: Pick<
+        chevre.factory.creativeWork.noteDigitalDocument.INoteAboutProduct,
+        'about' | 'creator' | 'identifier' | 'project' | 'provider' | 'text' | 'version' | 'hasDigitalDocumentPermission'
+    > = {
+        about: { id: '656038908b1cd5ce629f5992', typeOf: chevre.factory.product.ProductType.EventService },
+        creator: { id: 'xxx', typeOf: chevre.factory.personType.Person },
+        identifier: 'abcdefgh',
+        project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+        provider: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+        text: 'sample note text...',
+        version: '1',
+        hasDigitalDocumentPermission: []
+
+    };
+    const createResult = await noteRepo.upsertNotesByIdentifier(
+        [
+            {
+                $set: creatingNote
+                // $unset: {}
+            },
+            {
+                $set: creatingNote
+                // $unset: {}
+            }
+        ],
+        { update: false }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(createResult, { depth: null });
+
+    const updateResult = await noteRepo.upsertNotesByIdentifier(
+        [
+            {
+                $set: creatingNote
+            }
+        ],
+        { update: true }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(updateResult, { depth: null });
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/roles/removeConsolePermissionIfExists.ts

@@ -9,11 +9,8 @@ async function main() {
     const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
     const permissions = [
-        'assetTransactions.cancelReservation.write',
-        'orders.read',
-        'orders.update',
-        'reservations.attended',
-        'reservations.read'
+        'notes.*',
+        'notes.read'
     ];
     for (const permission of permissions) {
         const roles = await roleRepo.projectFields(

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

@@ -2,7 +2,7 @@ import { factory as surfrockFactory } from '@surfrock/sdk';
 import { Connection, FilterQuery, UpdateQuery } from 'mongoose';
 import * as factory from '../factory';
 export type IAction4transaction<T extends factory.actionType.AcceptAction | factory.actionType.AuthorizeAction> = T extends factory.actionType.AcceptAction ? factory.action.accept.coaOffer.IAction | factory.action.accept.pay.IAction : T extends factory.actionType.AuthorizeAction ? (factory.action.authorize.offer.eventService.IAction | factory.action.authorize.offer.moneyTransfer.IAction | factory.action.authorize.offer.product.IAction | factory.action.authorize.paymentMethod.any.IAction) : never;
-export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AcceptAction ? IAction4transaction<factory.actionType.AcceptAction> : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : T extends factory.actionType.CheckAction ? (factory.action.check.paymentMethod.movieTicket.IAction | factory.action.check.token.IAction) : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction<factory.action.update.replace.IAttributes<any, any>> : T extends factory.actionType.InformAction ? factory.action.interact.inform.IAction<factory.action.interact.inform.IAttributes<factory.action.interact.inform.IObject>> & {
+export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AcceptAction ? IAction4transaction<factory.actionType.AcceptAction> : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : T extends factory.actionType.CheckAction ? (factory.action.check.paymentMethod.movieTicket.IAction | factory.action.check.token.IAction) : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.AddAction ? factory.action.update.add.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAction : T extends factory.actionType.InformAction ? factory.action.interact.inform.IAction<factory.action.interact.inform.IAttributes<factory.action.interact.inform.IObject>> & {
     error?: any;
     purpose?: never;
 } : factory.action.IAction<factory.action.IAttributes<T, any, any>>;

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

@@ -1,10 +1,13 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IDocType = factory.creativeWork.noteDigitalDocument.INoteDigitalDocument;
+type IDocType = Pick<factory.creativeWork.noteDigitalDocument.INoteDigitalDocument, 'creator' | 'dateCreated' | 'dateModified' | 'editor' | 'hasDigitalDocumentPermission' | 'identifier' | 'project' | 'text' | 'typeOf' | 'version'> & {
+    about: factory.creativeWork.noteDigitalDocument.IAbout;
+    provider: factory.creativeWork.noteDigitalDocument.IProviderAsProject | factory.creativeWork.noteDigitalDocument.IProviderAsSeller;
+};
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Note";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -18,7 +18,8 @@ const schemaDefinition = {
     creator: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     editor: mongoose_1.SchemaTypes.Mixed,
     version: { type: String, required: true },
-    typeOf: { type: String, required: true }
+    typeOf: { type: String, required: true },
+    hasDigitalDocumentPermission: { type: mongoose_1.SchemaTypes.Mixed, required: false } // 2025-09-17~
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -1,3 +1,4 @@
+import type { BulkWriteResult, DeleteResult } from 'mongodb';
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type INoteDigitalDocument = factory.creativeWork.noteDigitalDocument.INoteDigitalDocument;
@@ -12,12 +13,43 @@ export declare class NoteRepo {
     findNotes(params: factory.creativeWork.noteDigitalDocument.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<(INoteDigitalDocument & {
         id: string;
     })[]>;
-    deleteManyByAbout(params: {
+    /**
+     * メモ識別子をキーにして冪等置換
+     */
+    upsertNotesByIdentifier(params: {
+        $set: Pick<INoteDigitalDocument, 'about' | 'creator' | 'identifier' | 'project' | 'provider' | 'text' | 'version' | 'hasDigitalDocumentPermission'> & {
+            id?: never;
+        };
+    }[], options: {
+        /**
+         * falseの場合setOnInsertのみ
+         * trueの場合setのみ
+         */
+        update: boolean;
+    }): Promise<{
+        bulkWriteResult: BulkWriteResult;
+        modifiedNotes: {
+            id: string;
+        }[];
+    } | void>;
+    /**
+     * 既知のメモIDリストからメモを削除する
+     */
+    deleteNotesByIds(params: {
+        project: {
+            id: string;
+        };
+        ids: string[];
+    }): Promise<DeleteResult | void>;
+    /**
+     * 主題リソースから全メモを削除する
+     */
+    deleteNotesByAbout(params: {
         about: {
             id: string;
             typeOf: factory.creativeWork.noteDigitalDocument.IAbout['typeOf'];
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<DeleteResult>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

package/lib/chevre/repo/note.js

@@ -24,7 +24,8 @@ const AVAILABLE_PROJECT_FIELDS = [
     'creator',
     'editor',
     'version',
-    'typeOf'
+    'typeOf',
+    'hasDigitalDocumentPermission'
 ];
 /**
  * メモリポジトリ
@@ -34,7 +35,7 @@ class NoteRepo {
         this.noteModel = connection.model(note_1.modelName, (0, note_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         const andConditions = [];
         const idIn = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$in;
         if (Array.isArray(idIn)) {
@@ -64,11 +65,15 @@ class NoteRepo {
         if (Array.isArray(aboutOrderNumberIn)) {
             andConditions.push({ 'about.orderNumber': { $exists: true, $in: aboutOrderNumberIn } });
         }
-        const identifierEq = (_p = params.identifier) === null || _p === void 0 ? void 0 : _p.$eq;
+        const aboutTypeOfEq = (_q = (_p = params.about) === null || _p === void 0 ? void 0 : _p.typeOf) === null || _q === void 0 ? void 0 : _q.$eq;
+        if (typeof aboutTypeOfEq === 'string') {
+            andConditions.push({ 'about.typeOf': { $eq: aboutTypeOfEq } });
+        }
+        const identifierEq = (_r = params.identifier) === null || _r === void 0 ? void 0 : _r.$eq;
         if (typeof identifierEq === 'string') {
             andConditions.push({ identifier: { $eq: identifierEq } });
         }
-        const identifierIn = (_q = params.identifier) === null || _q === void 0 ? void 0 : _q.$in;
+        const identifierIn = (_s = params.identifier) === null || _s === void 0 ? void 0 : _s.$in;
         if (Array.isArray(identifierIn)) {
             andConditions.push({ identifier: { $in: identifierIn } });
         }
@@ -96,11 +101,103 @@ class NoteRepo {
                     .skip(params.limit * (page - 1));
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean() // 2024-09-19~
+                .lean()
                 .exec();
         });
     }
-    deleteManyByAbout(params) {
+    /**
+     * メモ識別子をキーにして冪等置換
+     */
+    upsertNotesByIdentifier(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const now = new Date();
+            const { update } = options;
+            const bulkWriteOps = [];
+            const queryFilters = [];
+            if (Array.isArray(params)) {
+                params.forEach(({ $set }) => {
+                    const { about, creator, identifier, project, provider, text, version, hasDigitalDocumentPermission } = $set;
+                    if (typeof identifier !== 'string' || identifier.length === 0) {
+                        throw new factory.errors.ArgumentNull('identifier');
+                    }
+                    if (typeof version !== 'string' || version.length === 0) {
+                        throw new factory.errors.ArgumentNull('version');
+                    }
+                    if (typeof text !== 'string') {
+                        throw new factory.errors.ArgumentNull('text');
+                    }
+                    // リソースのユニークネスを保証するfilter
+                    const filter = {
+                        'project.id': { $eq: project.id },
+                        'about.id': { $eq: about.id },
+                        identifier: { $eq: identifier },
+                        version: { $eq: version }
+                    };
+                    queryFilters.push({
+                        'project.id': { $eq: project.id },
+                        'about.id': { $eq: about.id },
+                        identifier: { $eq: identifier },
+                        version: { $eq: version }
+                    });
+                    if (update === true) {
+                        const setFields = Object.assign({ dateModified: now, editor: creator, text }, (Array.isArray(hasDigitalDocumentPermission)) ? { hasDigitalDocumentPermission } : undefined);
+                        const updateFilter = {
+                            $set: setFields
+                            // ...($unset !== undefined) ? { $unset } : undefined
+                        };
+                        const updateOne = {
+                            filter,
+                            update: updateFilter,
+                            upsert: false
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
+                    else {
+                        const setOnInsert = Object.assign({ about, creator, identifier, project, provider, version, dateCreated: now, typeOf: factory.creativeWorkType.NoteDigitalDocument, text }, (Array.isArray(hasDigitalDocumentPermission)) ? { hasDigitalDocumentPermission } : undefined);
+                        const updateFilter = {
+                            $setOnInsert: setOnInsert
+                        };
+                        const updateOne = {
+                            filter,
+                            update: updateFilter,
+                            upsert: true
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.noteModel.bulkWrite(bulkWriteOps, { ordered: false });
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedNotes = yield this.noteModel.find({ $or: queryFilters }, {
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                })
+                    .lean()
+                    .exec();
+                return { bulkWriteResult, modifiedNotes };
+            }
+        });
+    }
+    /**
+     * 既知のメモIDリストからメモを削除する
+     */
+    deleteNotesByIds(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { project, ids } = params;
+            if (Array.isArray(ids) && ids.length > 0) {
+                return this.noteModel.deleteMany({
+                    'project.id': { $eq: project.id },
+                    _id: { $in: ids }
+                })
+                    .exec();
+            }
+        });
+    }
+    /**
+     * 主題リソースから全メモを削除する
+     */
+    deleteNotesByAbout(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.noteModel.deleteMany({
                 'about.id': { $eq: String(params.about.id) },

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/event.js

@@ -63,7 +63,8 @@ function importFromCOA(params) {
             object: Object.assign(Object.assign({}, params), { startDate: `${moment(targetImportFrom) // debug(2024-04-26~)
                     .toISOString()}/${moment(targetImportThrough)
                     .toISOString()}`, superEvent: { location: { branchCode: params.locationBranchCode } }, typeOf: factory.eventType.ScreeningEvent }),
-            instrument
+            instrument,
+            targetCollection: { typeOf: factory.eventType.ScreeningEvent }
         };
         const action = yield repos.action.start(actionAttributes);
         let savedScreeningEventsCount = 0;
@@ -150,7 +151,8 @@ function processUpdateMovieTheater(params) {
                 theaterCode: params.locationBranchCode,
                 typeOf: 'WebAPI',
                 identifier: factory.service.webAPI.Identifier.COA
-            }
+            },
+            targetCollection: { typeOf: factory.placeType.MovieTheater }
         };
         const action = yield repos.action.start(actionAttributes);
         let seller;
@@ -345,6 +347,12 @@ function createScreeningEvents(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = params.project;
+        if (typeof params.instrument.begin !== 'string') {
+            throw new factory.errors.ArgumentNull('instrument.begin');
+        }
+        if (typeof params.instrument.end !== 'string') {
+            throw new factory.errors.ArgumentNull('instrument.end');
+        }
         // COAからイベント取得;
         const schedulesFromCOA = yield repos.masterService.schedule({
             theaterCode: params.instrument.theaterCode,

package/lib/chevre/service/order/deleteOrder.js

@@ -44,7 +44,7 @@ function deleteOrder(params) {
         // 経理レポート削除
         yield repos.accountingReport.deleteByOrderNumber({ mainEntity: { orderNumber: order.orderNumber } });
         // メモ削除(2024-02-15~)
-        yield repos.note.deleteManyByAbout({
+        yield repos.note.deleteNotesByAbout({
             about: {
                 id: order.id,
                 typeOf: factory.order.OrderType.Order

package/lib/chevre/service/task/createEvent/createEventBySchedule.js

@@ -34,7 +34,7 @@ function updateEvent4ttts(params) {
             // replacee: reservation,
             // replacer: params.attributes, // $unsetもありうるのでいったん保留
             targetCollection: {
-                id: params.attributes.identifier,
+                // id: params.attributes.identifier,
                 typeOf: factory.eventType.ScreeningEvent
             }
         };

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/task/onResourceUpdated/onResourceDeleted.d.ts

@@ -7,6 +7,7 @@ import type { CreativeWorkRepo } from '../../../repo/creativeWork';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { MemberRepo } from '../../../repo/member';
+import type { NoteRepo } from '../../../repo/note';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
@@ -30,6 +31,7 @@ export declare function onResourceDeleted(params: factory.task.onResourceUpdated
     hasPOS: HasPOSRepo;
     member: MemberRepo;
     movieTheater: MovieTheaterRepo;
+    note: NoteRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -414,6 +414,7 @@ function deleteResourcesByProduct(params) {
             try {
                 let deleteEventResult;
                 let updateOfferResult;
+                let deleteNoteResult;
                 // 興行を設定されたイベント削除
                 deleteEventResult = yield repos.event.deleteManyEventsByItemOfferedId({
                     project: { id: params.project.id },
@@ -424,7 +425,11 @@ function deleteResourcesByProduct(params) {
                     project: { id: params.project.id },
                     addOn: { itemOffered: { id: { $in: [productId] } } }
                 });
-                deleteResult = { deleteEventResult, updateOfferResult };
+                // メモを削除(2025-09-18~)
+                deleteNoteResult = yield repos.note.deleteNotesByAbout({
+                    about: { id: productId, typeOf: params.typeOf }
+                });
+                deleteResult = { deleteEventResult, updateOfferResult, deleteNoteResult };
             }
             catch (error) {
                 try {

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.0",
+    "@chevre/factory": "4.399.0-alpha.11",
     "@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.0"
+  "version": "22.14.0-alpha.10"
 }

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);