@chevre/domain 21.30.0-alpha.3 → 21.30.0-alpha.4

package/example/src/chevre/optimizeActions.ts

@@ -0,0 +1,54 @@
+// 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.ConfirmAction },
+                // typeOf: { $eq: chevre.factory.actionType.SendAction },
+                // typeOf: { $eq: chevre.factory.actionType.ReturnAction },
+                typeOf: { $eq: chevre.factory.actionType.PayAction },
+                '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
+            }
+        });
+        console.log(
+            'unset processed.', updateResult,
+            -index, 'hours',
+            moment.duration(index, 'hours')
+                .asDays(),
+            'days'
+        );
+    }
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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

@@ -169,7 +169,12 @@ export declare class MongoRepository {
                 $eq: string;
             };
         };
-    }): Promise<Pick<IAction<factory.actionType>, 'id' | 'actionStatus'>[]>;
+        purpose?: {
+            id: {
+                $eq: string;
+            };
+        };
+    }): Promise<Pick<IAction<factory.actionType>, 'id' | 'actionStatus' | 'error'>[]>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/action.js

@@ -536,11 +536,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();
         });
     }
     /**
@@ -702,9 +708,12 @@ class MongoRepository {
         });
     }
     searchBySameAs(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const query = this.actionModel.find({ 'sameAs.id': { $exists: true, $eq: params.sameAs.id.$eq } })
-                .select({ _id: 1, actionStatus: 1 })
+            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()));

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

@@ -58,7 +58,10 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (yield actionRepo.searchBySameAs({ sameAs: { id: { $eq: params.id } } })).shift();
+            const action = (yield actionRepo.searchBySameAs({
+                sameAs: { id: { $eq: params.id } },
+                purpose: { id: { $eq: params.data.purpose.id } }
+            })).shift();
             if (typeof (action === null || action === void 0 ? void 0 : action.id) === 'string') {
                 throwsError = false;
             }

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.30.0-alpha.3"
+  "version": "21.30.0-alpha.4"
 }

package/example/src/chevre/optimizeDeleteTransactionActions.ts

@@ -1,57 +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) };
-
-// 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
-    // tslint:disable-next-line:no-magic-numbers
-    for (let index = 0; index < 24 * 548; index++) {
-        const updateResult = await actionRepo.unsetUnnecessaryFields({
-            filter: {
-                typeOf: { $eq: chevre.factory.actionType.DeleteAction },
-                'object.typeOf': { $exists: true, $eq: chevre.factory.transactionType.PlaceOrder },
-                startDate: {
-                    $gte: moment()
-                        .add(-(index + 1), 'hours')
-                        .toDate(),
-                    $lte: moment()
-                        .add(-index, 'hours')
-                        .toDate()
-                }
-                // _id: { $eq: '65fbb1746e12c17600902282' }
-            },
-            $unset: {
-                'object._id': 1,
-                'object.agent': 1,
-                'object.seller': 1,
-                'object.object.passportToken': 1,
-                'object.object.authorizeActions': 1,
-                'object.object.clientUser': 1,
-                'object.object.customer': 1,
-                'object.object.passport': 1,
-                'object.status': 1,
-                'object.expires': 1,
-                'object.tasksExportationStatus': 1,
-                'object.createdAt': 1,
-                'object.updatedAt': 1,
-                'object.potentialActions': 1,
-                'object.result': 1
-            }
-        });
-        console.log('unset processed.', updateResult, -index, 'hours', moment.duration(index, 'hours')
-            .asDays());
-    }
-}
-
-main()
-    .then()
-    .catch(console.error);