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

package/example/src/chevre/cleanTransactions.ts

@@ -0,0 +1,39 @@
+// 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 = 365;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
+
+    // tslint:disable-next-line:no-increment-decrement no-magic-numbers
+    for (let index = 0; index < 1800; index++) {
+        const updateResult = await transactionRepo.deleteEndDatePassedCertainPeriod({
+            typeOf: chevre.factory.transactionType.MoneyTransfer,
+            endDate: {
+                $gte: moment()
+                    .add(-(index + STORAGE_PERIOD_IN_DAYS + 1), 'days')
+                    .toDate(),
+                $lt: moment()
+                    .add(-(index + STORAGE_PERIOD_IN_DAYS), 'days')
+                    .toDate()
+            }
+        });
+        console.log(
+            'unset processed.', updateResult, -(index + STORAGE_PERIOD_IN_DAYS), 'days',
+            moment.duration(index + STORAGE_PERIOD_IN_DAYS, 'days')
+                .humanize());
+    }
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/optimizeActions.ts

@@ -0,0 +1,67 @@
+// 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) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+
+    // tslint:disable-next-line:no-increment-decrement no-magic-numbers
+    for (let index = 0; index < 24 * 548; index++) {
+        const updateResult = await actionRepo.unsetUnnecessaryFields({
+            filter: {
+                typeOf: { $eq: chevre.factory.actionType.OrderAction },
+                'object.typeOf': { $exists: true, $eq: chevre.factory.order.OrderType.Order },
+                // 'purpose.typeOf': { $exists: true, $eq: chevre.factory.order.OrderType.Order },
+                startDate: {
+                    $gte: moment()
+                        .add(-(index + 1), 'hours')
+                        .toDate(),
+                    $lte: moment()
+                        .add(-index, 'hours')
+                        .toDate()
+                }
+                // _id: { $eq: '61da235d94a80f000af85f6b' }
+            },
+            $unset: {
+                // 'purpose.project': 1,
+                // 'purpose.seller': 1,
+                // 'purpose.customer': 1
+                'object.project': 1,
+                'object.seller': 1,
+                'object.customer': 1,
+                'object.paymentMethods': 1,
+                'object.discounts': 1,
+                'object.acceptedOffers': 1,
+                'object.url': 1,
+                'object.orderStatus': 1,
+                'object.identifier': 1,
+                'object.isGift': 1,
+                'object.broker': 1,
+                'object.dateReturned': 1,
+                'object.name': 1,
+                'object.orderedItem': 1,
+                'object.returner': 1
+            }
+        });
+        console.log(
+            'unset processed.', updateResult,
+            -index, 'hours',
+            moment.duration(index, 'hours')
+                .asDays(),
+            'days'
+        );
+    }
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/searchActions.ts

@@ -24,7 +24,8 @@ async function main() {
             //         serviceOutput: { reservationFor: { id: { $eq: 'clhvvbpyn' } } }
             //     }
             // }
-            instrument: { transactionNumber: { $eq: 'x' } }
+            // instrument: { transactionNumber: { $eq: 'x' } },
+            sameAs: { id: { $eq: '66275034ae5d4c3e8997808c' } }
         },
         ['_id'],
         []

package/example/src/chevre/searchActionsBySameAs.ts

@@ -0,0 +1,26 @@
+// tslint:disable:no-implicit-dependencies no-console
+import { chevre } from '../../../lib/index';
+
+import * as  mongoose from 'mongoose';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+    const actions = await actionRepo.searchBySameAs({
+        sameAs: { id: { $eq: '662456a40e9f9ad3b50f1481' } }
+    });
+    console.log('actions:', actions);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/searchTasks.ts

@@ -0,0 +1,43 @@
+// tslint:disable:no-implicit-dependencies no-console
+import { chevre } from '../../../lib/index';
+
+import * as  mongoose from 'mongoose';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const indexes = await mongoose.connection.db.collection('tasks')
+        .indexes();
+    // console.log(indexes);
+    console.log(indexes.length, 'indexes found');
+
+    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
+    const tasks = await taskRepo.search(
+        {
+            limit: 1,
+            page: 1
+            // typeOf: { $eq: chevre.factory.actionType.CheckAction },
+            // project: { id: { $eq: project.id } },
+            // object: {
+            //     movieTickets: {
+            //         identifier: { $eq: '0947524082' },
+            //         serviceOutput: { reservationFor: { id: { $eq: 'clhvvbpyn' } } }
+            //     }
+            // }
+            // instrument: { transactionNumber: { $eq: 'x' } },
+        }
+    );
+    console.log('tasks:', tasks);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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

@@ -22,7 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
 export type IPayAction = factory.action.trade.pay.IAction;
@@ -163,6 +163,18 @@ export declare class MongoRepository {
         orderNumber: string;
         sort?: factory.action.ISortOrder;
     }): Promise<IAction<factory.actionType>[]>;
+    searchBySameAs(params: {
+        sameAs: {
+            id: {
+                $eq: string;
+            };
+        };
+        purpose?: {
+            id: {
+                $eq: string;
+            };
+        };
+    }): Promise<Pick<IAction<factory.actionType>, 'id' | 'actionStatus' | 'error'>[]>;
     deleteByProject(params: {
         project: {
             id: string;
@@ -290,6 +302,10 @@ export declare class MongoRepository {
         startThrough: Date;
     }): Promise<IAggregateAction>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<factory.action.IAction<factory.action.IAttributes<factory.actionType, any, any>>>;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
     /**
      * 互換性維持対応専用
      */

package/lib/chevre/repo/action.js

@@ -22,7 +22,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69, _70, _71, _72, _73;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69, _70, _71, _72, _73, _74, _75;
         const andConditions = [];
         const idIn = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$in;
         if (Array.isArray(idIn)) {
@@ -33,8 +33,6 @@ class MongoRepository {
             andConditions.push({ _id: { $nin: idNin } });
         }
         const projectIdEq = (_d = (_c = params.project) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof projectIdEq === 'string') {
             andConditions.push({
                 'project.id': {
@@ -42,8 +40,6 @@ class MongoRepository {
                 }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         const agentTypeOfIn = (_f = (_e = params.agent) === null || _e === void 0 ? void 0 : _e.typeOf) === null || _f === void 0 ? void 0 : _f.$in;
         if (Array.isArray(agentTypeOfIn)) {
             andConditions.push({
@@ -71,8 +67,6 @@ class MongoRepository {
             andConditions.push({ 'instrument.typeOf': { $exists: true, $eq: instrumentTypeOfEq } });
         }
         const locationIdEq = (_p = (_o = params.location) === null || _o === void 0 ? void 0 : _o.id) === null || _p === void 0 ? void 0 : _p.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof locationIdEq === 'string') {
             andConditions.push({
                 'location.id': {
@@ -82,8 +76,6 @@ class MongoRepository {
             });
         }
         const locationIdentifierEq = (_r = (_q = params.location) === null || _q === void 0 ? void 0 : _q.identifier) === null || _r === void 0 ? void 0 : _r.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof locationIdentifierEq === 'string') {
             andConditions.push({
                 'location.identifier': {
@@ -110,8 +102,6 @@ class MongoRepository {
                 }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         const objectPaymentMethodIdEq = (_1 = (_0 = params.object) === null || _0 === void 0 ? void 0 : _0.paymentMethodId) === null || _1 === void 0 ? void 0 : _1.$eq;
         if (typeof objectPaymentMethodIdEq === 'string') {
             andConditions.push({
@@ -131,8 +121,6 @@ class MongoRepository {
             });
         }
         const objectReservationForIdEq = (_7 = (_6 = (_5 = params.object) === null || _5 === void 0 ? void 0 : _5.reservationFor) === null || _6 === void 0 ? void 0 : _6.id) === null || _7 === void 0 ? void 0 : _7.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof objectReservationForIdEq === 'string') {
             andConditions.push({
                 'object.reservationFor.id': {
@@ -160,8 +148,6 @@ class MongoRepository {
             });
         }
         const objectPaymentMethodAccountIdEq = (_14 = (_13 = (_12 = params.object) === null || _12 === void 0 ? void 0 : _12.paymentMethod) === null || _13 === void 0 ? void 0 : _13.accountId) === null || _14 === void 0 ? void 0 : _14.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof objectPaymentMethodAccountIdEq === 'string') {
             andConditions.push({
                 'object.paymentMethod.accountId': {
@@ -171,8 +157,6 @@ class MongoRepository {
             });
         }
         const objectPaymentMethodPaymentMethodIdEq = (_17 = (_16 = (_15 = params.object) === null || _15 === void 0 ? void 0 : _15.paymentMethod) === null || _16 === void 0 ? void 0 : _16.paymentMethodId) === null || _17 === void 0 ? void 0 : _17.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof objectPaymentMethodPaymentMethodIdEq === 'string') {
             andConditions.push({
                 'object.paymentMethod.paymentMethodId': {
@@ -191,8 +175,6 @@ class MongoRepository {
             });
         }
         const objectPaymentMethodTypeOfEq = (_23 = (_22 = (_21 = params.object) === null || _21 === void 0 ? void 0 : _21.paymentMethod) === null || _22 === void 0 ? void 0 : _22.typeOf) === null || _23 === void 0 ? void 0 : _23.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof objectPaymentMethodTypeOfEq === 'string') {
             andConditions.push({
                 'object.paymentMethod.typeOf': {
@@ -202,8 +184,6 @@ class MongoRepository {
             });
         }
         const objectTypeOfEq = (_25 = (_24 = params.object) === null || _24 === void 0 ? void 0 : _24.typeOf) === null || _25 === void 0 ? void 0 : _25.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof objectTypeOfEq === 'string') {
             andConditions.push({
                 'object.typeOf': {
@@ -222,8 +202,6 @@ class MongoRepository {
             });
         }
         const objectIdEq = (_29 = (_28 = params.object) === null || _28 === void 0 ? void 0 : _28.id) === null || _29 === void 0 ? void 0 : _29.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof objectIdEq === 'string') {
             andConditions.push({
                 'object.id': {
@@ -272,8 +250,6 @@ class MongoRepository {
         if (typeof objectTransactionNumberEq === 'string') {
             andConditions.push({ 'object.transactionNumber': { $exists: true, $eq: objectTransactionNumberEq } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof params.typeOf === 'string') {
             andConditions.push({
                 typeOf: params.typeOf
@@ -281,8 +257,6 @@ class MongoRepository {
         }
         else {
             const typeOfEq = (_46 = params.typeOf) === null || _46 === void 0 ? void 0 : _46.$eq;
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
             if (typeof typeOfEq === 'string') {
                 andConditions.push({
                     typeOf: { $eq: typeOfEq }
@@ -290,30 +264,22 @@ class MongoRepository {
             }
         }
         const actionStatusIn = (_47 = params.actionStatus) === null || _47 === void 0 ? void 0 : _47.$in;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (Array.isArray(actionStatusIn)) {
             andConditions.push({
                 actionStatus: { $in: actionStatusIn }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (Array.isArray(params.actionStatusTypes)) {
             andConditions.push({
                 actionStatus: { $in: params.actionStatusTypes }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         const startDateGte = params.startFrom;
         if (startDateGte instanceof Date) {
             andConditions.push({
                 startDate: { $gte: startDateGte }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         const startDateLte = params.startThrough;
         if (startDateLte instanceof Date) {
             andConditions.push({
@@ -437,6 +403,11 @@ class MongoRepository {
                 }
             });
         }
+        // sameAs(2024-04-23~)
+        const sameAsIdEq = (_75 = (_74 = params.sameAs) === null || _74 === void 0 ? void 0 : _74.id) === null || _75 === void 0 ? void 0 : _75.$eq;
+        if (typeof sameAsIdEq === 'string') {
+            andConditions.push({ 'sameAs.id': { $exists: true, $eq: sameAsIdEq } });
+        }
         return andConditions;
     }
     /**
@@ -536,11 +507,17 @@ class MongoRepository {
             const doc = yield this.actionModel.findOneAndUpdate({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf }
-            }, { actionStatus: factory.actionStatusType.CanceledActionStatus }, { new: false, projection: { _id: 1 } })
+            }, { $set: { actionStatus: factory.actionStatusType.CanceledActionStatus } }, { new: false, projection: { _id: 1 } })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.actionModel.modelName);
             }
+            // endDateが存在しなければセット(2024-04-22~)
+            yield this.actionModel.updateOne({
+                _id: { $eq: params.id },
+                endDate: { $exists: false }
+            }, { $set: { endDate: new Date() } })
+                .exec();
         });
     }
     /**
@@ -701,6 +678,18 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
+    searchBySameAs(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const query = this.actionModel.find(Object.assign({ 'sameAs.id': { $exists: true, $eq: params.sameAs.id.$eq } }, (typeof ((_a = params.purpose) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string')
+                ? { 'purpose.id': { $exists: true, $eq: params.purpose.id.$eq } }
+                : undefined))
+                .select({ _id: 1, actionStatus: 1, error: 1 })
+                .limit(1);
+            return query.exec()
+                .then((docs) => docs.map((doc) => doc.toObject()));
+        });
+    }
     deleteByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.actionModel.deleteMany({
@@ -1024,6 +1013,12 @@ class MongoRepository {
             .sort({ startDate: factory.sortType.Descending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.actionModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
     /**
      * 互換性維持対応専用
      */

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

@@ -26,7 +26,8 @@ const schemaDefinition = {
     instrument: mongoose_1.SchemaTypes.Mixed,
     location: mongoose_1.SchemaTypes.Mixed,
     replacer: mongoose_1.SchemaTypes.Mixed,
-    targetCollection: mongoose_1.SchemaTypes.Mixed // add targetCollection(2024-03-19~)
+    targetCollection: mongoose_1.SchemaTypes.Mixed,
+    sameAs: mongoose_1.SchemaTypes.Mixed // タスク関連付けのために追加(2024-04-20~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -35,7 +36,6 @@ const schemaOptions = {
     id: true,
     read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
-    // true化(2022-11-12~)
     strict: true,
     strictQuery: false,
     timestamps: {
@@ -405,6 +405,15 @@ const indexes = [
                 'object.transactionNumber': { $exists: true }
             }
         }
+    ],
+    [
+        { 'sameAs.id': 1, startDate: -1 },
+        {
+            name: 'searchBySameAsId',
+            partialFilterExpression: {
+                'sameAs.id': { $exists: true }
+            }
+        }
     ]
 ];
 exports.indexes = indexes;

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

@@ -1,5 +1,5 @@
 import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
 declare const modelName = "Task";
-declare function createSchema(): Schema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
 export { modelName, indexes, createSchema };