@chevre/domain 22.3.0-alpha.13 → 22.3.0-alpha.15

package/example/src/chevre/migrateEventSeries2secondary.ts

@@ -0,0 +1,70 @@
+// 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 eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
+
+    const cursor = eventSeriesRepo.getCursor(
+        {
+            typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries }
+        },
+        {
+            _id: 1,
+            startDate: 1,
+            project: 1,
+            typeOf: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const eventSeries: Pick<chevre.factory.event.screeningEventSeries.IEvent, 'id' | 'startDate' | 'project' | 'typeOf'> =
+            doc.toObject();
+        const alreadyMigrated = false;
+        if (alreadyMigrated) {
+            console.log(
+                'already exist.',
+                eventSeries.project.id,
+                eventSeries.typeOf,
+                eventSeries.id,
+                eventSeries.startDate, i, updateCount
+            );
+        } else {
+            updateCount += 1;
+            console.log(
+                'updating...',
+                eventSeries.project.id,
+                eventSeries.typeOf,
+                eventSeries.id,
+                eventSeries.startDate, i, updateCount
+            );
+            await eventSeriesRepo.sync2secondary({
+                id: eventSeries.id
+            });
+            console.log(
+                'updated.',
+                eventSeries.project.id,
+                eventSeries.typeOf,
+                eventSeries.id,
+                eventSeries.startDate, i, updateCount
+            );
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(updateCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/event.js

@@ -777,7 +777,7 @@ class EventRepo {
     findAnyEventById(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.eventModel.findOne(Object.assign({ _id: { $eq: params.id.$eq }, 'project.id': { $eq: params.project.id.$eq } }, (typeof ((_a = params.organizer) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string')
+            const doc = yield this.eventModel.findOne(Object.assign({ _id: { $eq: params.id.$eq }, 'project.id': { $eq: params.project.id.$eq }, typeOf: { $in: [factory.eventType.Event, factory.eventType.ScreeningEvent] } }, (typeof ((_a = params.organizer) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string')
                 ? { 'organizer.id': { $exists: true, $eq: params.organizer.id.$eq } }
                 : undefined), {
                 __v: 0,

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

@@ -1,6 +1,31 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection, Document, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
+import { IDocType } from './mongoose/schemas/event';
 type ISearchConditions = Omit<factory.event.ISearchConditions<factory.eventType.ScreeningEventSeries>, 'typeOfIn' | 'hasOfferCatalog'>;
 type IKeyOfProjection = Exclude<keyof factory.event.IEvent<factory.eventType.ScreeningEventSeries>, 'id'>;
 type IUnset = {
@@ -107,5 +132,34 @@ export declare class EventSeriesRepo {
     sync2secondary(params: {
         id: string;
     }): Promise<void>;
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, IDocType> & Omit<(import("@chevre/factory/lib/event/anyEvent").IAttributes & {
+        _id: string;
+    } & Required<{
+        _id: string;
+    }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
+        _id: string;
+        alternateName?: any;
+        aggregateOffer?: import("@chevre/factory/lib/event/anyEvent").IAggregateOffer | undefined;
+    } & Required<{
+        _id: string;
+    }>) | (import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {
+        _id: string;
+    } & Required<{
+        _id: string;
+    }>), never>, import("mongoose").QueryOptions<Document<unknown, {}, IDocType> & Omit<(import("@chevre/factory/lib/event/anyEvent").IAttributes & {
+        _id: string;
+    } & Required<{
+        _id: string;
+    }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
+        _id: string;
+        alternateName?: any;
+        aggregateOffer?: import("@chevre/factory/lib/event/anyEvent").IAggregateOffer | undefined;
+    } & Required<{
+        _id: string;
+    }>) | (import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {
+        _id: string;
+    } & Required<{
+        _id: string;
+    }>), never>>>;
 }
 export {};

package/lib/chevre/repo/eventSeries.js

@@ -645,5 +645,10 @@ class EventSeriesRepo {
             }
         });
     }
+    getCursor(conditions, projection) {
+        return this.eventModel.find(conditions, projection)
+            .sort({ startDate: factory.sortType.Descending })
+            .cursor();
+    }
 }
 exports.EventSeriesRepo = EventSeriesRepo;

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

@@ -50,6 +50,9 @@ export declare function importFromCOA(params: IImportFromCOAParams): (repos: {
     seller: SellerRepo;
     masterService: COA.service.Master;
 }) => Promise<void>;
+export declare function minimizeSuperEvent(params: {
+    superEvent: factory.event.screeningEventSeries.IEvent;
+}): factory.event.screeningEvent.ISuperEvent;
 /**
  * COA情報からイベントIDを作成する
  */

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.createEvent = exports.updateEvent4ttts = exports.createScreeningEventIdFromCOA = exports.importFromCOA = void 0;
+exports.createEvent = exports.updateEvent4ttts = exports.createScreeningEventIdFromCOA = exports.minimizeSuperEvent = exports.importFromCOA = void 0;
 const createDebug = require("debug");
 // @ts-ignore
 const difference = require("lodash.difference");
@@ -480,6 +480,24 @@ function cancelDeletedEvents(params) {
         return cancelledIds;
     });
 }
+function minimizeSuperEvent(params) {
+    const { workPerformed, videoFormat, startDate, soundFormat, name, location, kanaName, identifier, endDate, duration, coaInfo, alternativeHeadline, 
+    // additionalProperty,
+    typeOf, id
+    // project,
+    // organizer,
+    // offers,
+    // eventStatus
+     } = params.superEvent;
+    return {
+        workPerformed, videoFormat, startDate, soundFormat,
+        name, location, kanaName, identifier,
+        endDate, duration, coaInfo, alternativeHeadline,
+        // additionalProperty,
+        typeOf, id
+    };
+}
+exports.minimizeSuperEvent = minimizeSuperEvent;
 /**
  * コアデータからイベントを作成する
  */
@@ -551,6 +569,7 @@ function createScreeningEventFromCOA(params) {
         }
     };
     const { additionalProperty, coaInfo } = createScreeningEventAdditionalPropertyFromCOA(params);
+    const superEvent = minimizeSuperEvent({ superEvent: params.superEvent }); // optimize superEvent(2024-09-10~)
     return {
         project: { typeOf: params.project.typeOf, id: params.project.id },
         typeOf: factory.eventType.ScreeningEvent,
@@ -565,7 +584,7 @@ function createScreeningEventFromCOA(params) {
         },
         endDate: endDate,
         startDate: startDate,
-        superEvent: params.superEvent,
+        superEvent,
         coaInfo,
         offers: offers,
         checkInCount: 0,

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": "22.3.0-alpha.13"
+  "version": "22.3.0-alpha.15"
 }

package/example/src/chevre/migrateMembers2.ts

@@ -1,74 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-const NEW_ROLE_NAME = 'sellerAdmin';
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const memberRepo = await chevre.repository.Member.createInstance(mongoose.connection);
-
-    const cursor = memberRepo.getCursor(
-        {
-            'member.memberOf.typeOf': { $eq: chevre.factory.organizationType.Project },
-            'member.hasRole.roleName': { $eq: 'inventoryManager' }
-        },
-        {
-        }
-    );
-    console.log('members found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const inventoryManager: chevre.factory.iam.IMember = doc.toObject();
-        const alreadyMigrated = inventoryManager.member.hasRole.some(({ roleName }) => roleName === NEW_ROLE_NAME);
-        if (alreadyMigrated) {
-            console.log(
-                'already exist.',
-                inventoryManager.project.id,
-                inventoryManager.member.memberOf.typeOf, inventoryManager.member.memberOf.id, i, updateCount
-            );
-        } else {
-            updateCount += 1;
-            const newHasRole: chevre.factory.iam.IMemberRole[] = [
-                ...inventoryManager.member.hasRole.map(({ roleName }) => {
-                    return { typeOf: chevre.factory.iam.RoleType.OrganizationRole, roleName };
-                }),
-                { typeOf: chevre.factory.iam.RoleType.OrganizationRole, roleName: NEW_ROLE_NAME }
-            ].sort((a, b) => (a.roleName > b.roleName) ? 1 : -1);
-            console.log(
-                'updating...',
-                inventoryManager.project.id,
-                inventoryManager.member.memberOf.typeOf, inventoryManager.member.memberOf.id, i, updateCount, newHasRole
-            );
-            await memberRepo.updateByMemberId({
-                project: { id: inventoryManager.project.id },
-                member: {
-                    id: inventoryManager.member.id,
-                    memberOf: inventoryManager.member.memberOf,
-                    hasRole: newHasRole
-                },
-                $unset: {}
-            });
-            console.log(
-                'updated.',
-                inventoryManager.project.id,
-                inventoryManager.member.memberOf.typeOf, inventoryManager.member.memberOf.id, i, updateCount
-            );
-        }
-    });
-
-    console.log(i, 'members checked');
-    console.log(updateCount, 'members updated');
-}
-
-main()
-    .then()
-    .catch(console.error);