@chevre/domain 21.13.0-alpha.9 → 21.13.0

package/example/src/chevre/importEventsFromCOA.ts

@@ -10,28 +10,31 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const actionRepo = new chevre.repository.Action(mongoose.connection);
-    const categoryCodeRepo = new chevre.repository.CategoryCode(mongoose.connection);
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-    const placeRepo = new chevre.repository.Place(mongoose.connection);
-    const sellerRepo = new chevre.repository.Seller(mongoose.connection);
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+    const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
+    const creativeWorkRepo = await chevre.repository.CreativeWork.createInstance(mongoose.connection);
+    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+    const placeRepo = await chevre.repository.Place.createInstance(mongoose.connection);
+    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
 
-    await chevre.service.event.importFromCOA({
+    await (await chevre.service.event.createService()).importFromCOA({
         project: {
             id: project.id,
             typeOf: chevre.factory.organizationType.Project
         },
-        locationBranchCode: '022',
+        locationBranchCode: '120',
         importFrom: moment()
             .toDate(),
         importThrough: moment()
             .add(1, 'day')
             .toDate(),
         saveMovieTheater: false,
-        saveScreeningEventSeries: false
+        saveScreeningEventSeries: true,
+        saveScreeningEventSeriesPeriodInMonth: 24
     })({
         action: actionRepo,
         categoryCode: categoryCodeRepo,
+        creativeWork: creativeWorkRepo,
         event: eventRepo,
         place: placeRepo,
         seller: sellerRepo

package/example/src/chevre/migrateCognitoUser.ts

@@ -13,7 +13,7 @@ export async function migrateUser(params: {
     let oldPerson: chevre.factory.person.IPerson | undefined;
 
     try {
-        const oldPersonRepo = new chevre.repository.Person({ userPoolId: USERPOOL_ID_OLD });
+        const oldPersonRepo = await chevre.repository.Person.createInstance({ userPoolId: USERPOOL_ID_OLD });
         oldPerson = await oldPersonRepo.findById({ userId: params.id });
         console.log('oldPerson found', oldPerson.id, oldPerson.givenName, oldPerson.familyName);
     } catch (error) {
@@ -33,7 +33,7 @@ export async function migrateUser(params: {
     }
 
     // create user
-    const newPersonRepo = new chevre.repository.Person({ userPoolId: USERPOOL_ID_NEW });
+    const newPersonRepo = await chevre.repository.Person.createInstance({ userPoolId: USERPOOL_ID_NEW });
     const newUsername = `${NEW_USERPOOL_PROVIDER_NAME}_${oldPerson.id}`;
     const newUserId = await new Promise<string>((resolve, reject) => {
         newPersonRepo.cognitoIdentityServiceProvider.adminCreateUser(
@@ -60,7 +60,7 @@ export async function migrateUser(params: {
                     console.error('user not created.', err);
                     reject(err);
                 } else {
-                    resolve(String(data.User?.Attributes?.find((a) => a.Name === 'sub')?.Value));
+                    resolve(String(data?.User?.Attributes?.find((a) => a.Name === 'sub')?.Value));
                 }
             }
         );

package/example/src/chevre/migrateOwnershipInfos2newUserPool.ts

@@ -16,7 +16,7 @@ const PRODUCT_TYPE = chevre.factory.product.ProductType.EventService;
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
-    const ownershipInfoRepo = new chevre.repository.OwnershipInfo(mongoose.connection);
+    const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
 
     const now = new Date();
     const cursor = ownershipInfoRepo.getCursor(
@@ -78,7 +78,7 @@ async function main() {
                 ownershipInfo.typeOfGood.identifier,
                 ownershipInfo.ownedFrom,
                 owner.id, owner.memberOf?.membershipNumber, i, notFoundCount);
-            const personRepo = new chevre.repository.Person({ userPoolId: USERPOOL_ID_NEW });
+            const personRepo = await chevre.repository.Person.createInstance({ userPoolId: USERPOOL_ID_NEW });
 
             try {
                 const newUserAttributes = await personRepo.getUserAttributes({ username: `SSKTS_${owner.id}` });

package/example/src/chevre/ownershipInfosCsv2peopleJson.ts

@@ -32,10 +32,10 @@ async function main() {
         autoIndex: false
     });
 
-    const sellerRepo = new chevre.repository.Seller(mongoose.connection);
+    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
     const sellers = <Pick<chevre.factory.seller.ISeller, 'id' | 'name'>[]>await sellerRepo.search({}, ['_id', 'name'], []);
 
-    const personRepo = new chevre.repository.Person({
+    const personRepo = await chevre.repository.Person.createInstance({
         userPoolId: <string>process.env.COGNITO_USER_POOL_ID
     });
 
@@ -132,7 +132,7 @@ function findAccount(params: {
     now: Date;
 }) {
     return async (): Promise<chevre.factory.ownershipInfo.IPermitAsGood | undefined> => {
-        const ownershipInfoRepo = new chevre.repository.OwnershipInfo(mongoose.connection);
+        const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
 
         // let accountOwnershipInfos = await search({
         //     project: { typeOf: factory.organizationType.Project, id: params.project.id },

package/example/src/chevre/person/globalSignOutAndDisable.ts

@@ -2,7 +2,7 @@
 import { chevre } from '../../../../lib/index';
 
 async function main() {
-    const personRepo = new chevre.repository.Person({
+    const personRepo = await chevre.repository.Person.createInstance({
         userPoolId: <string>process.env.USERPOOL_ID_NEW
     });
 

package/example/src/chevre/person/search.ts

@@ -1,26 +1,18 @@
 // tslint:disable:no-console no-magic-numbers
 import { chevre } from '../../../../lib/index';
 
-// const cognitoIdentityServiceProvider = new chevre.AWS.CognitoIdentityServiceProvider({
-//     apiVersion: 'latest',
-//     region: 'ap-northeast-1',
-//     credentials: new chevre.AWS.Credentials({
-//         accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-//         secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY
-//     })
-// });
-
 async function main() {
     const userPoolId = process.env.COGNITO_USER_POOL_ID;
-    const username = 'test';
+    const username = 'Google_108017370984644649288';
 
-    const personRepo = new chevre.repository.Person({
+    const personRepo = await chevre.repository.Person.createInstance({
         userPoolId: String(userPoolId)
     });
 
     const people = await personRepo.search({
         username: username
     });
+    console.log(people[0]);
     console.log(people.length, 'people found');
 
     // await Promise.all(people.map(async (person) => {

package/example/src/chevre/person/updateProfile.ts

@@ -2,11 +2,11 @@
 import { chevre } from '../../../../lib/index';
 
 async function main() {
-    const personRepo = new chevre.repository.Person({
+    const personRepo = await chevre.repository.Person.createInstance({
         userPoolId: <string>process.env.COGNITO_USER_POOL_ID
     });
 
-    const username = '';
+    const username = 'xxx';
 
     let profile = await personRepo.getUserAttributes({
         username: username

package/lib/chevre/repo/creativeWork.js

@@ -192,23 +192,23 @@ class MongoRepository {
                     if (typeof identifier !== 'string' || identifier.length === 0) {
                         throw new factory.errors.ArgumentNull('identifier');
                     }
-                    bulkWriteOps.push({
-                        updateOne: {
-                            filter: {
-                                typeOf: typeOf,
-                                'project.id': { $eq: project.id },
-                                identifier: { $eq: identifier }
-                            },
-                            update: {
-                                $setOnInsert: Object.assign(Object.assign({}, setOnInsertFields), { typeOf,
-                                    project,
-                                    identifier }),
-                                // 変更可能な属性のみ上書き
-                                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (name !== undefined) ? { name } : undefined), (contentRating !== undefined) ? { contentRating } : undefined), (duration !== undefined) ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined), (datePublished !== undefined) ? { datePublished } : undefined), (distributor !== undefined) ? { distributor } : undefined), (typeof thumbnailUrl === 'string') ? { thumbnailUrl } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty } : []),
-                                upsert: true
-                            }
-                        }
-                    });
+                    const updateFilter = {
+                        $setOnInsert: Object.assign(Object.assign({}, setOnInsertFields), { typeOf,
+                            project,
+                            identifier }),
+                        // 変更可能な属性のみ上書き
+                        $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (name !== undefined) ? { name } : undefined), (contentRating !== undefined) ? { contentRating } : undefined), (duration !== undefined) ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined), (datePublished !== undefined) ? { datePublished } : undefined), (distributor !== undefined) ? { distributor } : undefined), (typeof thumbnailUrl === 'string') ? { thumbnailUrl } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty } : [])
+                    };
+                    const updateOne = {
+                        filter: {
+                            typeOf: typeOf,
+                            'project.id': { $eq: project.id },
+                            identifier: { $eq: identifier }
+                        },
+                        update: updateFilter,
+                        upsert: true
+                    };
+                    bulkWriteOps.push({ updateOne });
                 });
             }
             if (bulkWriteOps.length > 0) {

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

@@ -77,11 +77,28 @@ interface IStatus {
 export interface IAggregateEvent {
     statuses: IStatus[];
 }
-interface IProjection {
-    [key: string]: number;
-}
+type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<T> & '_id';
+type IProjection<T extends factory.eventType> = {
+    [key in IKeyOfProjection<T>]?: 0 | 1;
+};
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
-export declare const PROJECTION_MINIMIZED_EVENT: IProjection;
+export declare const PROJECTION_MINIMIZED_EVENT: {
+    project: number;
+    organizer: number;
+    _id: number;
+    typeOf: number;
+    additionalProperty: number;
+    name: number;
+    doorTime: number;
+    endDate: number;
+    eventStatus: number;
+    location: number;
+    startDate: number;
+    superEvent: number;
+    offers: number;
+    coaInfo: number;
+    identifier: number;
+};
 /**
  * イベントリポジトリ
  */
@@ -133,13 +150,13 @@ export declare class MongoRepository {
     save<T extends factory.eventType>(params: {
         id?: string;
         attributes: factory.event.IAttributes<T>;
-        $unset?: IProjection;
+        $unset?: IProjection<T>;
         upsert?: boolean;
     }): Promise<factory.event.IEvent<T>>;
     saveMany<T extends factory.eventType>(params: {
         id: string;
         attributes: factory.event.IAttributes<T>;
-        $unset?: IProjection;
+        $unset?: IProjection<T>;
         upsert: boolean;
     }[]): Promise<void>;
     save4ttts(params: {
@@ -149,7 +166,7 @@ export declare class MongoRepository {
     /**
      * イベントを検索する
      */
-    search<T extends factory.eventType>(params: ISearchConditions<T>, projection?: IProjection): Promise<factory.event.IEvent<T>[]>;
+    search<T extends factory.eventType>(params: ISearchConditions<T>, projection?: IProjection<T>): Promise<factory.event.IEvent<T>[]>;
     searchIds<T extends factory.eventType>(params: ISearchConditions<T>): Promise<string[]>;
     findMinimizedIndividualEventById<T extends factory.eventType.ScreeningEvent | factory.eventType.Event>(params: {
         id: string;

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

@@ -1,25 +1,25 @@
-import * as AWS from 'aws-sdk';
+import { CognitoIdentityProvider } from '@aws-sdk/client-cognito-identity-provider';
+import type { AttributeType } from '@aws-sdk/client-cognito-identity-provider/dist-types/models/models_0';
 import * as factory from '../factory';
-export type AttributeListType = AWS.CognitoIdentityServiceProvider.AttributeListType;
 export type IPerson = factory.person.IPerson;
 /**
  * 会員リポジトリ
  */
 export declare class CognitoRepository {
-    readonly cognitoIdentityServiceProvider: AWS.CognitoIdentityServiceProvider;
+    readonly cognitoIdentityServiceProvider: CognitoIdentityProvider;
     private readonly userPoolId;
     constructor(params: {
         userPoolId: string;
     });
     static ATTRIBUTE2PROFILE(params: {
-        attributes?: AttributeListType;
+        attributes?: AttributeType[];
     }): factory.person.IProfile;
     static ATTRIBUTE2PERSON(params: {
         username?: string;
         userPoolId?: string;
-        attributes?: AttributeListType;
+        attributes?: AttributeType[];
     }): factory.person.IPerson;
-    static PROFILE2ATTRIBUTE(params: factory.person.IProfile): AttributeListType;
+    static PROFILE2ATTRIBUTE(params: factory.person.IProfile): AttributeType[];
     /**
      * 管理者権限でユーザー属性を取得する
      */

package/lib/chevre/repo/person.js

@@ -10,14 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CognitoRepository = void 0;
-const AWS = require("aws-sdk");
+const client_cognito_identity_provider_1 = require("@aws-sdk/client-cognito-identity-provider");
+const credential_providers_1 = require("@aws-sdk/credential-providers");
 const google_libphonenumber_1 = require("google-libphonenumber");
-const credentials_1 = require("../credentials");
 const factory = require("../factory");
-const awsCredentials = new AWS.Credentials({
-    accessKeyId: credentials_1.credentials.aws.accessKeyId,
-    secretAccessKey: credentials_1.credentials.aws.secretAccessKey
-});
+const awsCredentials = (0, credential_providers_1.fromEnv)();
 const TOKEN_ISSUER_ENDPOINT = 'https://cognito-idp.ap-northeast-1.amazonaws.com';
 /**
  * 会員リポジトリ
@@ -25,7 +22,7 @@ const TOKEN_ISSUER_ENDPOINT = 'https://cognito-idp.ap-northeast-1.amazonaws.com'
 class CognitoRepository {
     constructor(params) {
         this.userPoolId = params.userPoolId;
-        this.cognitoIdentityServiceProvider = new AWS.CognitoIdentityServiceProvider({
+        this.cognitoIdentityServiceProvider = new client_cognito_identity_provider_1.CognitoIdentityProvider({
             apiVersion: 'latest',
             region: 'ap-northeast-1',
             credentials: awsCredentials
@@ -35,7 +32,7 @@ class CognitoRepository {
         let additionalProperty = [];
         if (Array.isArray(params.attributes)) {
             additionalProperty = params.attributes.map((a) => {
-                return { name: a.Name, value: String(a.Value) };
+                return { name: String(a.Name), value: String(a.Value) };
             });
         }
         const profile = {
@@ -188,7 +185,7 @@ class CognitoRepository {
                         reject(err);
                     }
                     else {
-                        resolve(CognitoRepository.ATTRIBUTE2PROFILE({ attributes: data.UserAttributes }));
+                        resolve(CognitoRepository.ATTRIBUTE2PROFILE({ attributes: data === null || data === void 0 ? void 0 : data.UserAttributes }));
                     }
                 });
             });
@@ -232,7 +229,7 @@ class CognitoRepository {
                     else {
                         // tslint:disable-next-line:no-single-line-block-comment
                         /* istanbul ignore if: please write tests */
-                        if (data.Users === undefined) {
+                        if ((data === null || data === void 0 ? void 0 : data.Users) === undefined) {
                             reject(new factory.errors.NotFound('User'));
                         }
                         else {
@@ -267,7 +264,7 @@ class CognitoRepository {
                         reject(err);
                     }
                     else {
-                        resolve(CognitoRepository.ATTRIBUTE2PROFILE({ attributes: data.UserAttributes }));
+                        resolve(CognitoRepository.ATTRIBUTE2PROFILE({ attributes: data === null || data === void 0 ? void 0 : data.UserAttributes }));
                     }
                 });
             });
@@ -310,7 +307,7 @@ class CognitoRepository {
                     else {
                         // tslint:disable-next-line:no-single-line-block-comment
                         /* istanbul ignore if: please write tests */
-                        if (data.Users === undefined) {
+                        if ((data === null || data === void 0 ? void 0 : data.Users) === undefined) {
                             reject(new factory.errors.NotFound('User'));
                         }
                         else {
@@ -353,7 +350,7 @@ class CognitoRepository {
                     else {
                         // tslint:disable-next-line:no-single-line-block-comment
                         /* istanbul ignore if: please write tests */
-                        if (data.Users === undefined) {
+                        if ((data === null || data === void 0 ? void 0 : data.Users) === undefined) {
                             reject(new factory.errors.NotFound('User'));
                         }
                         else {
@@ -395,7 +392,7 @@ class CognitoRepository {
                         reject(listUsersErr);
                     }
                     else {
-                        const username = (_b = (_a = data.Users) === null || _a === void 0 ? void 0 : _a.shift()) === null || _b === void 0 ? void 0 : _b.Username;
+                        const username = (_b = (_a = data === null || data === void 0 ? void 0 : data.Users) === null || _a === void 0 ? void 0 : _a.shift()) === null || _b === void 0 ? void 0 : _b.Username;
                         if (typeof username !== 'string') {
                             reject(new factory.errors.NotFound('User'));
                         }
@@ -474,7 +471,7 @@ class CognitoRepository {
                     else {
                         // tslint:disable-next-line:no-single-line-block-comment
                         /* istanbul ignore if: please write tests */
-                        if (data.Users === undefined) {
+                        if ((data === null || data === void 0 ? void 0 : data.Users) === undefined) {
                             reject(new factory.errors.NotFound('User'));
                         }
                         else {

package/lib/chevre/repo/place/hasPOS.d.ts

@@ -13,8 +13,8 @@ interface IOperator {
  * 施設のPOSリポジトリ
  */
 export declare class MongoRepository {
+    readonly operator: IOperator;
     private readonly placeModel;
-    private readonly operator;
     constructor(connection: Connection, operater: IOperator);
     search(params: {
         limit?: number;
@@ -28,7 +28,7 @@ export declare class MongoRepository {
                 $eq?: string;
             };
         };
-    }): Promise<Pick<factory.place.movieTheater.IPOS, 'branchCode' | 'name'>[]>;
+    }): Promise<Pick<factory.place.movieTheater.IPOS, 'branchCode' | 'name' | 'id'>[]>;
     createByBranchCode(params: Pick<factory.place.movieTheater.IPOS, 'branchCode' | 'name'> & {
         project: {
             id: string;

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

@@ -22,10 +22,13 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { Connection } from 'mongoose';
+import type { AnyExpression, Connection } from 'mongoose';
 import * as factory from '../factory';
 type IScreeningRoomSectionWithoutContainsPlace = Omit<factory.place.screeningRoomSection.IPlace, 'containsPlace'>;
 export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
+export type IMovieTheaterIncludingScreeningRooms = factory.place.movieTheater.IPlace & {
+    containsPlace: factory.place.screeningRoom.IPlace[];
+};
 /**
  * 施設リポジトリ
  */
@@ -34,15 +37,18 @@ export declare class MongoRepository {
     constructor(connection: Connection);
     static CREATE_BUS_STOP_MONGO_CONDITIONS(params: factory.place.busStop.ISearchConditions): any[];
     static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): any[];
+    static CREATE_SEARCH_SEATS_PROJECTION(params: factory.place.seat.IProjection): {
+        [field: string]: AnyExpression;
+    };
     /**
      * 施設を保管する
      */
-    saveMovieTheater(params: factory.place.movieTheater.IPlaceWithoutScreeningRoom): Promise<factory.place.movieTheater.IPlaceWithoutScreeningRoom>;
-    saveMovieTheaterByBranchCode4coa(params: factory.place.movieTheater.IPlace): Promise<void>;
+    saveMovieTheater(params: factory.place.movieTheater.IPlace): Promise<factory.place.movieTheater.IPlace>;
+    saveMovieTheaterByBranchCode4coa(params: IMovieTheaterIncludingScreeningRooms): Promise<void>;
     /**
      * 施設検索
      */
-    searchMovieTheaters(params: factory.place.movieTheater.ISearchConditions & {}, inclusion: string[], exclusion: string[]): Promise<factory.place.movieTheater.IPlaceWithoutScreeningRoom[]>;
+    searchMovieTheaters(params: factory.place.movieTheater.ISearchConditions, inclusion: (keyof factory.place.movieTheater.IPlace | '_id' | 'url')[], exclusion: string[]): Promise<factory.place.movieTheater.IPlace[]>;
     deleteMovieTheaterById(params: {
         project: {
             id: string;
@@ -156,11 +162,7 @@ export declare class MongoRepository {
         };
         typeOf: factory.placeType.ScreeningRoom;
     }>;
-    searchScreeningRoomSections(searchConditions: factory.place.screeningRoomSection.ISearchConditions & {
-        $projection?: {
-            [key: string]: number;
-        };
-    }): Promise<IScreeningRoomSectionWithoutContainsPlace[]>;
+    searchScreeningRoomSections(searchConditions: factory.place.screeningRoomSection.ISearchConditions): Promise<IScreeningRoomSectionWithoutContainsPlace[]>;
     deleteScreeningRoomSection(screeningRoomSection: {
         project: {
             id: string;

package/lib/chevre/repo/place.js

@@ -209,6 +209,43 @@ class MongoRepository {
         }
         return andConditions;
     }
+    static CREATE_SEARCH_SEATS_PROJECTION(params) {
+        let includeScreeningRooms = true;
+        if (params['containedInPlace.containedInPlace'] === 0) {
+            includeScreeningRooms = false;
+        }
+        const projectStage = {
+            _id: 0,
+            typeOf: '$containsPlace.containsPlace.typeOf',
+            branchCode: '$containsPlace.containsPlace.branchCode',
+            name: '$containsPlace.containsPlace.name',
+            seatingType: '$containsPlace.containsPlace.seatingType',
+            containedInPlace: Object.assign({ typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name' }, (includeScreeningRooms)
+                ? {
+                    containedInPlace: {
+                        typeOf: '$typeOf',
+                        branchCode: '$branchCode',
+                        name: '$name',
+                        containedInPlace: {
+                            id: '$containedInPlace.id',
+                            typeOf: '$containedInPlace.typeOf',
+                            branchCode: '$containedInPlace.branchCode',
+                            name: '$containedInPlace.name'
+                        }
+                    }
+                }
+                : undefined),
+            additionalProperty: '$containsPlace.containsPlace.additionalProperty'
+        };
+        Object.keys(params)
+            .forEach((field) => {
+            if (typeof projectStage[field] === 'string') {
+                // tslint:disable-next-line:no-dynamic-delete
+                delete projectStage[field];
+            }
+        });
+        return projectStage;
+    }
     /**
      * 施設を保管する
      */
@@ -305,7 +342,9 @@ class MongoRepository {
             let projection = {};
             if (Array.isArray(inclusion) && inclusion.length > 0) {
                 inclusion.forEach((field) => {
-                    projection[field] = 1;
+                    if (String(field) !== 'containsPlace' && String(field) !== 'hasPOS') { // 除外(2023-10-26~)
+                        projection[field] = 1;
+                    }
                 });
             }
             else {
@@ -314,7 +353,8 @@ class MongoRepository {
                     createdAt: 0,
                     updatedAt: 0,
                     // containsPlaceを含めるとデータサイズが大きくなるので、検索結果には含めない
-                    containsPlace: 0
+                    containsPlace: 0,
+                    hasPOS: 0 // 除外(2023-10-26~)
                 };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
                     exclusion.forEach((field) => {
@@ -1193,11 +1233,6 @@ class MongoRepository {
                     }
                 });
             }
-            let includeScreeningRooms = true;
-            if (params.$projection !== undefined && params.$projection !== null
-                && params.$projection['containedInPlace.containedInPlace'] === 0) {
-                includeScreeningRooms = false;
-            }
             const additionalPropertyElemMatch = (_o = params.additionalProperty) === null || _o === void 0 ? void 0 : _o.$elemMatch;
             if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
                 matchStages.push({
@@ -1209,36 +1244,12 @@ class MongoRepository {
                     }
                 });
             }
+            const projectStage = MongoRepository.CREATE_SEARCH_SEATS_PROJECTION(Object.assign({}, params.$projection));
             const aggregate = this.placeModel.aggregate([
                 { $unwind: '$containsPlace' },
                 { $unwind: '$containsPlace.containsPlace' },
-                // { $unwind: '$containsPlace.containsPlace.containsPlace' },
                 ...matchStages,
-                {
-                    $project: {
-                        _id: 0,
-                        typeOf: '$containsPlace.containsPlace.typeOf',
-                        branchCode: '$containsPlace.containsPlace.branchCode',
-                        name: '$containsPlace.containsPlace.name',
-                        seatingType: '$containsPlace.containsPlace.seatingType',
-                        containedInPlace: Object.assign({ typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name' }, (includeScreeningRooms)
-                            ? {
-                                containedInPlace: {
-                                    typeOf: '$typeOf',
-                                    branchCode: '$branchCode',
-                                    name: '$name',
-                                    containedInPlace: {
-                                        id: '$containedInPlace.id',
-                                        typeOf: '$containedInPlace.typeOf',
-                                        branchCode: '$containedInPlace.branchCode',
-                                        name: '$containedInPlace.name'
-                                    }
-                                }
-                            }
-                            : undefined),
-                        additionalProperty: '$containsPlace.containsPlace.additionalProperty'
-                    }
-                }
+                { $project: projectStage }
             ]);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;

package/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -61,13 +61,6 @@ function findEntranceGates(params) {
                 limit: 1,
                 page: 1,
                 id: { $eq: params.event.superEvent.location.id }
-                // $projection: {
-                //     containsPlace: 0,
-                //     hasPOS: 0,
-                //     offers: 0,
-                //     parentOrganization: 0,
-                //     name: 0
-                // }
             }, ['hasEntranceGate'], []);
             movieTheater = searchMovieTheatersResult.shift();
             // movieTheater = await repos.place.findById(

package/lib/chevre/service/assetTransaction/reserve.js

@@ -223,7 +223,7 @@ function searchEventSeatOffers(params) {
                         }
                     }
                 },
-                $projection: params.$projection
+                $projection: Object.assign({}, params.$projection)
             });
             if (seats.length > 0) {
                 const availabilities = yield repos.stockHolder.searchHolders({

package/lib/chevre/service/event.js

@@ -274,6 +274,7 @@ function saveScreeningEventSeries(params) {
             savedEventsCount = saveParams.length;
             // コンテンツ永続化(2023-10-23~)
             try {
+                debug('saving', saveParams.length, 'movies...');
                 yield repos.creativeWork.upsertMoviesByIdentifier(saveParams.map((saveScreeningEventSeriesParams) => {
                     var _a;
                     return {
@@ -284,6 +285,7 @@ function saveScreeningEventSeries(params) {
                             : undefined)
                     };
                 }));
+                debug('saved', saveParams.length, 'movies');
             }
             catch (error) {
                 // tslint:disable-next-line:no-console

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

@@ -38,15 +38,13 @@ export declare function searchEventSeatOffersWithPaging(params: {
     event: {
         id: string;
     };
-    $projection?: {
-        [key: string]: number;
-    };
+    $projection?: factory.place.seat.IProjection;
 }): (repos: {
     event: EventRepo;
     priceSpecification: PriceSpecificationRepo;
     stockHolder: StockHolderRepo;
     place: PlaceRepo;
-}) => Promise<factory.place.seat.IPlaceWithOffer[]>;
+}) => Promise<Pick<factory.place.seat.IPlaceWithOffer, 'branchCode' | 'containedInPlace' | 'offers' | 'seatingType' | 'typeOf'>[]>;
 /**
  * イベント変更時処理
  */

package/lib/chevre/service/offer.js

@@ -88,7 +88,7 @@ function searchEventSeatOffersWithPaging(params) {
                             branchCode: { $eq: movieTheaterBranchCode }
                         }
                     }
-                } }));
+                }, $projection: Object.assign({}, params.$projection) }));
             if (seats.length > 0) {
                 const availabilities = yield repos.stockHolder.searchHolders({
                     project: { id: event.project.id },

package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.d.ts

@@ -1,5 +1,6 @@
 import * as factory from '../../../factory';
 import type { MongoRepository as PlaceRepo } from '../../../repo/place';
+import type { MongoRepository as HasPOSRepo } from '../../../repo/place/hasPOS';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 export declare function createInformHasPOSTasks(params: {
     project: {
@@ -11,6 +12,7 @@ export declare function createInformHasPOSTasks(params: {
     ids: string[];
     typeOf: factory.placeType.MovieTheater;
 }): (repos: {
+    hasPOS: HasPOSRepo;
     place: PlaceRepo;
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.js

@@ -18,19 +18,24 @@ function createInformHasPOSTasks(params) {
         if (params.ids.length !== 1) {
             throw new factory.errors.Argument('id', 'id.length must be 1');
         }
-        // 施設のhasPOSを全て連携する
         const movieTheaters = yield repos.place.searchMovieTheaters({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
             id: { $eq: params.ids[0] }
-        }, ['hasPOS'], []);
+        }, ['_id'], []);
         const movieTheater = movieTheaters.shift();
         if (movieTheater === undefined) {
             throw new factory.errors.NotFound(factory.placeType.MovieTheater);
         }
+        // 施設のhasPOSを全て連携する
+        repos.hasPOS.operator.id = movieTheater.id;
+        const hasPOS = yield repos.hasPOS.search({
+            project: { id: { $eq: params.project.id } }
+        });
         const movieTheaters4inform = [{
-                hasPOS: (Array.isArray(movieTheater.hasPOS)) ? movieTheater.hasPOS : [],
+                // hasPOS: (Array.isArray(movieTheater.hasPOS)) ? movieTheater.hasPOS : [],
+                hasPOS: (Array.isArray(hasPOS)) ? hasPOS : [],
                 id: movieTheater.id,
                 typeOf: factory.placeType.MovieTheater
             }];

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.d.ts

@@ -11,6 +11,7 @@ import type { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCat
 import type { MongoRepository as OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { MongoRepository as PlaceRepo } from '../../../repo/place';
+import type { MongoRepository as HasPOSRepo } from '../../../repo/place/hasPOS';
 import type { MongoRepository as ProductRepo } from '../../../repo/product';
 import type { MongoRepository as ProductOfferRepo } from '../../../repo/productOffer';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
@@ -21,6 +22,7 @@ export declare function onResourceDeleted(params: factory.task.onResourceUpdated
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
     event: EventRepo;
+    hasPOS: HasPOSRepo;
     member: MemberRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     offer: OfferRepo;

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -32,6 +32,8 @@ function onResourceDeleted(params) {
                 }
             }
             switch (params.typeOf) {
+                case 'POS':
+                    break;
                 case factory.eventType.ScreeningEventSeries:
                     yield deleteResourcesByScreeningEventSeries({
                         project: { id: params.project.id },

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

@@ -23,6 +23,7 @@ const offerCatalog_1 = require("../../repo/offerCatalog");
 const offerCatalogItem_1 = require("../../repo/offerCatalogItem");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const place_1 = require("../../repo/place");
+const hasPOS_1 = require("../../repo/place/hasPOS");
 const product_1 = require("../../repo/product");
 const productOffer_1 = require("../../repo/productOffer");
 const task_1 = require("../../repo/task");
@@ -43,6 +44,7 @@ function call(data) {
             categoryCode: new categoryCode_1.MongoRepository(connectionSettings.connection),
             creativeWork: new creativeWork_1.MongoRepository(connectionSettings.connection),
             event: new event_1.MongoRepository(connectionSettings.connection),
+            hasPOS: new hasPOS_1.MongoRepository(connectionSettings.connection, { id: '' }),
             member: new member_1.MongoRepository(connectionSettings.connection),
             offer: new offer_1.MongoRepository(connectionSettings.connection),
             offerCatalog: new offerCatalog_1.MongoRepository(connectionSettings.connection),
@@ -290,7 +292,7 @@ function createInformMovieTheaterTasks(params) {
             'additionalProperty',
             'branchCode',
             'hasEntranceGate',
-            'hasPOS',
+            // 'hasPOS',
             'kanaName',
             'name',
             'parentOrganization',

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -87,19 +87,12 @@ function createPaymentMethods(params) {
         const paymentMethodOfInvoice = Object.assign({ identifier: paymentMethodType }, (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
             { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } }
             : undefined);
-        paymentMethods.push({
-            accountId: resultAsInvoice.accountId,
-            additionalProperty: (Array.isArray(resultAsInvoice.additionalProperty)) ? resultAsInvoice.additionalProperty : [],
-            issuedThrough: resultAsInvoice.issuedThrough,
-            name: resultAsInvoice.name,
-            paymentMethodId: resultAsInvoice.paymentMethodId,
-            paymentStatus: resultAsInvoice.paymentStatus,
-            totalPaymentDue: resultAsInvoice.totalPaymentDue,
-            typeOf: paymentMethodType,
+        paymentMethods.push(Object.assign({ accountId: resultAsInvoice.accountId, additionalProperty: (Array.isArray(resultAsInvoice.additionalProperty)) ? resultAsInvoice.additionalProperty : [], issuedThrough: resultAsInvoice.issuedThrough, name: resultAsInvoice.name, paymentMethodId: resultAsInvoice.paymentMethodId, paymentStatus: resultAsInvoice.paymentStatus, totalPaymentDue: resultAsInvoice.totalPaymentDue, 
             // CreditCardIFのカード通貨区分を追加(2023-08-15~)
             // 決済方法区分を保証(2023-08-28~)
-            paymentMethod: paymentMethodOfInvoice
-        });
+            paymentMethod: paymentMethodOfInvoice }, {
+            typeOf: paymentMethodType // IFとして廃止だが、互換性維持対応として(2023-10-30~)
+        }));
     });
     // 決済方法から注文金額の計算
     price += authorizePaymentActions

package/package.json

@@ -9,8 +9,9 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.335.0",
-    "@cinerino/sdk": "4.0.0-alpha.1",
+    "@aws-sdk/credential-providers": "3.433.0",
+    "@chevre/factory": "4.337.0",
+    "@cinerino/sdk": "5.0.0-alpha.3",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -33,6 +34,7 @@
   },
   "description": "Chevre Domain Library for Node.js",
   "devDependencies": {
+    "@aws-sdk/client-cognito-identity-provider": "^3.433.0",
     "@types/debug": "0.0.30",
     "@types/google-libphonenumber": "^7.4.19",
     "@types/http-status": "^0.2.30",
@@ -51,7 +53,6 @@
     "@types/sinon-mongoose": "^1.3.11",
     "@types/uniqid": "^4.1.3",
     "@types/uuid": "^3.4.10",
-    "aws-sdk": "2.1348.0",
     "coveralls": "^3.1.0",
     "csvtojson": "^2.0.10",
     "googleapis": "^85.0.0",
@@ -72,7 +73,7 @@
     "typescript": "5.0.3"
   },
   "peerDependencies": {
-    "aws-sdk": "^2.0.0",
+    "@aws-sdk/client-cognito-identity-provider": "^3.433.0",
     "mongoose": "^7.0.5",
     "redis": "^4.6.5"
   },
@@ -81,6 +82,7 @@
     "npm": ">=6.0.0"
   },
   "keywords": [],
+  "license": "UNLICENSED",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [
@@ -115,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.13.0-alpha.9"
+  "version": "21.13.0"
 }

package/example/src/chevre/csv2json.ts

@@ -1,57 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-// import * as mongoose from 'mongoose';
-// tslint:disable-next-line:no-implicit-dependencies
-import * as csv from 'csvtojson';
-import * as fs from 'fs';
-import * as json2csv from 'json2csv';
-
-import { chevre } from '../../../lib/index';
-
-const csvFilePath = `${__dirname}/transactions.csv`;
-
-async function main() {
-
-    const personRepo = new chevre.repository.Person({
-        userPoolId: ''
-    });
-
-    const transactions = await csv()
-        .fromFile(csvFilePath);
-    console.log(transactions);
-
-    const reports = [];
-    for (const transaction of transactions) {
-        const people = await personRepo.search({
-            id: transaction.personId
-        });
-        console.log(people.length, people[0]?.memberOf?.membershipNumber, 'people found');
-
-        reports.push({
-            id: transaction.id,
-            transactionNumber: transaction.transactionNumber,
-            startDate: transaction.startDate,
-            personId: transaction.personId,
-            username: people[0]?.memberOf?.membershipNumber
-        });
-    }
-    // console.log(reports);
-    console.log(reports.length);
-    const fields = ['id', 'transactionNumber', 'startDate', 'personId', 'username'];
-    const opts = { fields };
-
-    try {
-        const usernamesCsv = json2csv.parse(reports, opts);
-        const usernameCsvPath = `${__dirname}/usernames.csv`;
-        // tslint:disable-next-line:non-literal-fs-path
-        fs.writeFileSync(usernameCsvPath, usernamesCsv);
-    } catch (err) {
-        console.error(err);
-    }
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);

package/example/src/chevre/person/createInformTask.ts

@@ -1,77 +0,0 @@
-// tslint:disable:no-console no-magic-numbers
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-type IPermitOwnershipInfo = chevre.factory.ownershipInfo.IOwnershipInfo<chevre.factory.ownershipInfo.IPermitAsGood>;
-
-const project = { id: <string>process.env.PROJECT_ID };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const now = new Date();
-
-    const ownershipInfoRepo = new chevre.repository.OwnershipInfo(mongoose.connection);
-    const newPersonRepo = new chevre.repository.Person({
-        userPoolId: <string>process.env.USERPOOL_ID_NEW
-    });
-    const oldPersonRepo = new chevre.repository.Person({
-        userPoolId: <string>process.env.USERPOOL_ID_OLD
-    });
-
-    const id = 'a7909268-a584-425e-8212-d7d10f344093';
-
-    const profile = await newPersonRepo.findById({
-        userId: id
-    });
-    console.log('profile found');
-
-    let oldUser;
-    const userIdentitiesStr = profile.additionalProperty?.find((p) => p.name === 'identities')?.value;
-    if (typeof userIdentitiesStr === 'string' && userIdentitiesStr.length > 0) {
-        try {
-            const identities = JSON.parse(userIdentitiesStr);
-            if (Array.isArray(identities) && identities.length > 0) {
-                const userIdByIdentities = identities[0].userId;
-                if (typeof userIdByIdentities === 'string' && userIdByIdentities.length > 0) {
-                    // oldUserは必ず存在するはず
-                    oldUser = await oldPersonRepo.findById({ userId: userIdByIdentities });
-                }
-            }
-        } catch (error) {
-            // tslint:disable-next-line:no-console
-            console.error('person2username throwed', error);
-            throw error;
-        }
-    }
-
-    const paymentCardOwnershipInfos = <IPermitOwnershipInfo[]>
-        await ownershipInfoRepo.search({
-            sort: { ownedFrom: chevre.factory.sortType.Ascending },
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: project.id } },
-            ownedFrom: now,
-            ownedThrough: now,
-            ownedBy: { id },
-            typeOfGood: {
-                issuedThrough: { typeOf: { $eq: chevre.factory.product.ProductType.PaymentCard } }
-            }
-        });
-    const paymentCardOwnershipInfo = paymentCardOwnershipInfos.shift();
-    console.log('paymentCard found');
-
-    console.log({
-        id,
-        // ...profile,
-        accountNumber: paymentCardOwnershipInfo?.typeOfGood.identifier,
-        ...oldUser
-    });
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);