@chevre/domain 21.4.0-alpha.18 → 21.4.0-alpha.19

package/example/src/chevre/migrateReservationProvider.ts

@@ -9,7 +9,7 @@ import { chevre } from '../../../lib/index';
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const reservationRepo = new chevre.repository.Reservation(mongoose.connection);
     const placeRepo = new chevre.repository.Place(mongoose.connection);
@@ -20,12 +20,12 @@ async function main() {
                 $in: [
                     chevre.factory.reservationType.EventReservation
                 ]
-            }
+            },
             // bookingTime: {
             //     $gte: moment('2023-06-09T00:00:00Z')
             //         .toDate()
             // }
-            // organizer: { $exists: false }
+            'provider.id': { $exists: false }
         },
         {
             _id: 1,
@@ -78,14 +78,24 @@ async function main() {
                 i
             );
             if (typeof sellerId !== 'string') {
+                console.error(
+                    'movieTheater not found',
+                    reservation.project.id, reservation.id, reservation.bookingTime, providerId, 'sellerId:', sellerId,
+                    'movieTheaterId:', movieTheaterId,
+                    'movieTheaterBranchCode:', movieTheaterBranchCode,
+                    i
+                );
                 throw new Error('movieTheater not found');
+
+                // return;
             }
             if (typeof sellerId === 'string') {
                 const newProvider: chevre.factory.reservation.IProvider = {
                     id: sellerId,
                     typeOf: chevre.factory.organizationType.Corporation
                 };
-                console.log('updating reservation...', reservation.project.id, reservation.id, reservation.bookingTime, providerId, i);
+                console.log(
+                    'updating reservation...', reservation.project.id, reservation.id, reservation.bookingTime, providerId, i, updateCount);
                 await reservationRepo.updatePartiallyById({
                     id: reservation.id,
                     update: <any>{
@@ -93,7 +103,7 @@ async function main() {
                     }
                 });
                 updateCount += 1;
-                console.log('updated.', reservation.project.id, reservation.id, reservation.bookingTime, providerId, i);
+                console.log('updated.', reservation.project.id, reservation.id, reservation.bookingTime, providerId, i, updateCount);
             }
         }
     });

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

@@ -63,7 +63,7 @@ export declare class MongoRepository {
              */
             $nin?: factory.taskName[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;

package/lib/chevre/service/event/createEvent.d.ts

@@ -0,0 +1,9 @@
+import * as factory from '../../factory';
+import { MongoRepository as ActionRepo } from '../../repo/action';
+import { MongoRepository as EventRepo } from '../../repo/event';
+import { MongoRepository as TaskRepo } from '../../repo/task';
+export declare function createEvent(params: factory.task.createEvent.IData): (repos: {
+    action: ActionRepo;
+    event: EventRepo;
+    task: TaskRepo;
+}) => Promise<void>;

package/lib/chevre/service/event/createEvent.js

@@ -0,0 +1,86 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createEvent = void 0;
+const factory = require("../../factory");
+// tslint:disable-next-line:max-func-body-length
+function createEvent(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const actionAttributes = params;
+        const action = yield repos.action.start(actionAttributes);
+        let eventIds = [];
+        let eventType;
+        try {
+            if (((_a = actionAttributes.instrument) === null || _a === void 0 ? void 0 : _a.createScreeningEventSeriesIfNotExistByWorkPerformed) === true) {
+                const bulkWriteResult = yield repos.event.createScreeningEventSeriesIfNotExistByWorkPerformed(actionAttributes.object.map((p) => {
+                    if (p.typeOf !== factory.eventType.ScreeningEventSeries) {
+                        throw new factory.errors.Argument('typeOf', `must be ${factory.eventType.ScreeningEventSeries}`);
+                    }
+                    return { attributes: p };
+                }));
+                let upsertedIds;
+                if (bulkWriteResult !== undefined) {
+                    upsertedIds = bulkWriteResult.getUpsertedIds()
+                        .map((doc) => doc._id.toString());
+                }
+                eventIds = (Array.isArray(upsertedIds)) ? upsertedIds : [];
+                eventType = factory.eventType.ScreeningEventSeries;
+            }
+            else {
+                // no op
+                throw new factory.errors.NotImplemented('only createScreeningEventSeriesIfNotExistByWorkPerformed implemented');
+            }
+        }
+        catch (error) {
+            // actionにエラー結果を追加
+            try {
+                const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        // アクション完了
+        yield repos.action.complete({
+            typeOf: action.typeOf,
+            id: action.id,
+            result: (Array.isArray(eventIds))
+                ? eventIds.map((eventId) => {
+                    return { id: eventId };
+                })
+                : undefined
+        });
+        if (Array.isArray(eventIds) && eventIds.length > 0) {
+            // 非同期に変更(2023-06-08~)
+            const onEventChangedTask = {
+                project: actionAttributes.project,
+                name: factory.taskName.OnEventChanged,
+                status: factory.taskStatus.Ready,
+                runsAt: new Date(),
+                remainingNumberOfTries: 3,
+                numberOfTried: 0,
+                executionResults: [],
+                data: {
+                    id: eventIds,
+                    project: { id: actionAttributes.project.id },
+                    typeOf: eventType,
+                    isNew: true,
+                    useInform: true
+                }
+            };
+            yield repos.task.saveMany([onEventChangedTask], { emitImmediately: true });
+        }
+    });
+}
+exports.createEvent = createEvent;

package/lib/chevre/service/event.d.ts

@@ -6,6 +6,7 @@ import { MongoRepository as ProjectRepo } from '../repo/project';
 import { MongoRepository as SellerRepo } from '../repo/seller';
 import { MongoRepository as TaskRepo } from '../repo/task';
 import * as factory from '../factory';
+import { createEvent } from './event/createEvent';
 /**
  * Googleで作品画像を検索する
  */
@@ -71,3 +72,4 @@ export declare function updateEvent4ttts(params: {
     project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<void>;
+export { createEvent };

package/lib/chevre/service/event.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateEvent4ttts = exports.createScreeningEventIdFromCOA = exports.importFromCOA = void 0;
+exports.createEvent = exports.updateEvent4ttts = exports.createScreeningEventIdFromCOA = exports.importFromCOA = void 0;
 /**
  * マスターデータ同期サービス
  */
@@ -21,6 +21,8 @@ const difference = require("lodash.difference");
 const moment = require("moment-timezone");
 const credentials_1 = require("../credentials");
 const factory = require("../factory");
+const createEvent_1 = require("./event/createEvent");
+Object.defineProperty(exports, "createEvent", { enumerable: true, get: function () { return createEvent_1.createEvent; } });
 const offer_1 = require("./offer");
 const debug = createDebug('chevre-domain:service:event');
 const coaAuthClient = new COA.auth.RefreshToken({

package/lib/chevre/service/task/createEvent.d.ts

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.createEvent.IData): IOperation<void>;

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

@@ -0,0 +1,29 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.call = void 0;
+const action_1 = require("../../repo/action");
+const event_1 = require("../../repo/event");
+const task_1 = require("../../repo/task");
+const EventService = require("../event");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        yield EventService.createEvent(data)({
+            action: new action_1.MongoRepository(settings.connection),
+            event: new event_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.316.0-alpha.1",
-    "@cinerino/sdk": "3.160.0-alpha.5",
+    "@chevre/factory": "4.316.0-alpha.2",
+    "@cinerino/sdk": "3.161.0-alpha.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.4.0-alpha.18"
+  "version": "21.4.0-alpha.19"
 }