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

package/example/src/chevre/deleteStartDatePassedCertainPeriod.ts

@@ -0,0 +1,27 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+
+    const lt: Date = moment()
+        // tslint:disable-next-line:no-magic-numbers
+        .add(-16, 'months')
+        .toDate();
+    let result: any;
+    result = await actionRepo.deleteStartDatePassedCertainPeriod({
+        $lt: lt
+    });
+    console.log('result:', result, lt);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/optimizeActions.ts

@@ -13,13 +13,14 @@ async function main() {
     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++) {
+    for (let index = 0; index < 24 * 1000; 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 },
+                // typeOf: { $eq: chevre.factory.actionType.OrderAction },
+                'agent.typeOf': { $exists: true, $eq: chevre.factory.creativeWorkType.WebApplication },
+                // 'agent.typeOf': { $exists: true, $eq: chevre.factory.personType.Person },
                 startDate: {
+                    // $exists: true,
                     $gte: moment()
                         .add(-(index + 1), 'hours')
                         .toDate(),
@@ -30,24 +31,27 @@ async function main() {
                 // _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
+                'agent.identifier': 1,
+                'agent.memberOf': 1,
+                'agent.email': 1,
+                'agent.familyName': 1,
+                'agent.givenName': 1,
+                'agent.telephone': 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(

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

@@ -47,6 +47,10 @@ interface IOptionOnCreate {
 export type IExecutableTaskKeys = 'data' | 'id' | 'name' | 'status' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'expires';
 export type IExecutableTask<T extends factory.taskName> = Pick<factory.task.ITask<T>, IExecutableTaskKeys>;
 type IDelayedTask = Pick<factory.task.ITask<factory.taskName>, 'id' | 'name' | 'status'>;
+type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | '_id';
+type IProjection = {
+    [key in IKeyOfProjection]?: 0;
+};
 /**
  * タスクリポジトリ
  */
@@ -114,7 +118,14 @@ export declare class MongoRepository {
     abortMany(params: {
         intervalInMinutes: number;
     }): Promise<UpdateWriteOpResult>;
-    pushExecutionResultById(id: string, status: factory.taskStatus, executionResult: factory.task.IExecutionResult): Promise<void>;
+    /**
+     * 実行結果を保管する
+     */
+    pushExecutionResultById(
+    /**
+     * タスクID
+     */
+    id: string, status: factory.taskStatus, executionResult: factory.task.IExecutionResult): Promise<void>;
     /**
      * 特定タスク検索
      */
@@ -126,7 +137,7 @@ export declare class MongoRepository {
     /**
      * 検索する
      */
-    search(params: factory.task.ISearchConditions, projection?: any): Promise<factory.task.ITask<factory.taskName>[]>;
+    search(params: factory.task.ISearchConditions, projection?: IProjection): Promise<factory.task.ITask<factory.taskName>[]>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/task.js

@@ -526,10 +526,17 @@ class MongoRepository {
                 .exec();
         });
     }
-    pushExecutionResultById(id, status, executionResult) {
+    /**
+     * 実行結果を保管する
+     */
+    pushExecutionResultById(
+    /**
+     * タスクID
+     */
+    id, status, executionResult) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.taskModel.findByIdAndUpdate(id, {
-                status: status,
+            yield this.taskModel.updateOne({ _id: { $eq: id } }, {
+                $set: { status },
                 $push: { executionResults: executionResult }
             })
                 .exec();
@@ -541,8 +548,8 @@ class MongoRepository {
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.taskModel.findOne({
-                name: params.name,
-                _id: params.id
+                name: { $eq: params.name },
+                _id: { $eq: params.id }
             }, {
                 __v: 0,
                 createdAt: 0,
@@ -622,7 +629,8 @@ class MongoRepository {
             const runsAtLt = moment()
                 .add(-params.delayInSeconds, 'seconds')
                 .toDate();
-            return this.taskModel.count(Object.assign({ status: factory.taskStatus.Ready, runsAt: { $lt: runsAtLt } }, (Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined))
+            return this.taskModel.count(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: runsAtLt } }, (Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined))
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }

package/lib/chevre/service/event.js

@@ -77,11 +77,28 @@ function importFromCOA(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = params.project;
+        const targetImportFrom = moment(`${moment(params.importFrom)
+            .tz('Asia/Tokyo')
+            .format('YYYY-MM-DD')}T00:00:00+09:00`);
+        const targetImportThrough = moment(`${moment(params.importThrough)
+            .tz('Asia/Tokyo')
+            .format('YYYY-MM-DD')}T00:00:00+09:00`)
+            .add(1, 'day');
+        const begin = moment(targetImportFrom)
+            .add(-1, 'day') // 深夜帯スケジュールが前日検索の結果に含まれるため
+            .tz('Asia/Tokyo')
+            .format('YYYYMMDD'); // COAは日本時間で判断
+        const end = moment(targetImportThrough)
+            .add(-1, 'day')
+            .tz('Asia/Tokyo')
+            .format('YYYYMMDD'); // COAは日本時間で判断
+        debug('importing screening events...', targetImportFrom, targetImportThrough, begin, end);
         const actionAttributes = {
             project: { typeOf: factory.organizationType.Project, id: params.project.id },
             typeOf: factory.actionType.UpdateAction,
             agent: { typeOf: factory.organizationType.Project, id: params.project.id },
-            object: Object.assign(Object.assign({}, params), { typeOf: factory.eventType.ScreeningEvent })
+            object: Object.assign(Object.assign({}, params), { begin,
+                end, typeOf: factory.eventType.ScreeningEvent })
         };
         const action = yield repos.action.start(actionAttributes);
         let savedScreeningEventsCount = 0;
@@ -126,14 +143,6 @@ function importFromCOA(params) {
                 project: { id: { $eq: project.id } },
                 containedInPlace: { branchCode: { $eq: movieTheater.branchCode } }
             });
-            const targetImportFrom = moment(`${moment(params.importFrom)
-                .tz('Asia/Tokyo')
-                .format('YYYY-MM-DD')}T00:00:00+09:00`);
-            const targetImportThrough = moment(`${moment(params.importThrough)
-                .tz('Asia/Tokyo')
-                .format('YYYY-MM-DD')}T00:00:00+09:00`)
-                .add(1, 'day');
-            debug('importing screening events...', targetImportFrom, targetImportThrough);
             const { screeningEventSerieses, savedEventsCount } = yield saveScreeningEventSeries({
                 locationBranchCode: params.locationBranchCode,
                 movieTheater,

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.10"
+  "version": "21.30.0-alpha.12"
 }