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

package/example/src/chevre/deleteDiscontinuedPeopleByFetch.ts

@@ -2,15 +2,14 @@
 // import * as moment from 'moment';
 
 const TIMEOUT_MS = 5000;
-const INTERVAL_MS = 5000;
+const INTERVAL_MS = 3000;
 
 let i = 0;
 setInterval(
     async () => {
         i += 1;
         try {
-            const url = 'https://cron2-dot-chevre-api-production.appspot.com/cron/deleteDiscontinuedPeople';
-
+            const url = String(process.env.DISCONTINUE_PEOPLE_URL);
             const res = await fetch(
                 url,
                 {

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

@@ -1,17 +1,25 @@
 // tslint:disable:no-console
-import { CognitoIdentityProvider, UserType } from '@aws-sdk/client-cognito-identity-provider';
+import { CognitoIdentityProvider, ListUsersInGroupCommandOutput, UserType } from '@aws-sdk/client-cognito-identity-provider';
 import { fromEnv } from '@aws-sdk/credential-providers';
 import * as moment from 'moment';
+import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../../lib/index';
 
-export const USERPOOL_ID_OLD = String(process.env.USERPOOL_ID_OLD);
-export const USERPOOL_ID_NEW = String(process.env.USERPOOL_ID_NEW);
-const USER_GROUP_NAME = String(process.env.USER_GROUP_NAME); // 'ap-northeast-1_XXXXXXXXX_SSKTS',
-const NEW_USERPOOL_PROVIDER_NAME = 'SSKTS';
+const USERPOOL_PROVIDER_NAME = 'SSKTS';
 
 // tslint:disable-next-line:max-func-body-length
 async function main(): Promise<void> {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
+    const setting = await settingRepo.findOne({ project: { id: { $eq: '*' } } }, ['userPoolIdNew']);
+    if (typeof setting?.userPoolIdNew !== 'string') {
+        throw new chevre.factory.errors.NotFound('setting.userPoolIdNew');
+    }
+    const userPoolId: string = setting.userPoolIdNew;
+    const USER_GROUP_NAME = `${userPoolId}_${USERPOOL_PROVIDER_NAME}`; // 'ap-northeast-1_XXXXXXXXX_SSKTS',
+
     const awsCredentials = fromEnv();
     const cognitoIdentityServiceProvider = new CognitoIdentityProvider({
         apiVersion: 'latest',
@@ -21,7 +29,7 @@ async function main(): Promise<void> {
 
     // create user
     const newPersonRepo = await chevre.repository.Person.createInstance({
-        userPoolId: USERPOOL_ID_NEW,
+        userPoolId: userPoolId,
         cognitoIdentityServiceProvider
     });
 
@@ -31,10 +39,10 @@ async function main(): Promise<void> {
     while (typeof nextToken === 'string') {
         page += 1;
         console.log('listUsersInGroup processing...', nextToken, page);
-        const listUsersInGroupResult = await newPersonRepo.cognitoIdentityServiceProvider.listUsersInGroup(
+        const listUsersInGroupResult = <ListUsersInGroupCommandOutput>await newPersonRepo.cognitoIdentityServiceProvider.listUsersInGroup(
             {
                 Limit: 50,
-                UserPoolId: USERPOOL_ID_NEW,
+                UserPoolId: userPoolId,
                 GroupName: USER_GROUP_NAME,
                 ...(typeof nextToken === 'string' && nextToken !== '') ? { NextToken: nextToken } : undefined
             }
@@ -52,7 +60,7 @@ async function main(): Promise<void> {
     const oneMonthAgo = moment()
         .add(-1, 'months');
     for (const user of users) {
-        const isSSKTSMember = user.Username?.startsWith(NEW_USERPOOL_PROVIDER_NAME, 0);
+        const isSSKTSMember = user.Username?.startsWith(USERPOOL_PROVIDER_NAME, 0);
         if (!isSSKTSMember) {
             console.error(user);
             throw new Error('not ssktsMember');
@@ -64,7 +72,7 @@ async function main(): Promise<void> {
             console.log('disabling...', user.Username, sub);
             // disable link provider
             const adminDisableUserResult = await newPersonRepo.cognitoIdentityServiceProvider.adminDisableUser({
-                UserPoolId: USERPOOL_ID_NEW,
+                UserPoolId: userPoolId,
                 Username: user.Username
             });
             console.log('disabled.', user.Username, sub, adminDisableUserResult);
@@ -74,7 +82,7 @@ async function main(): Promise<void> {
                     .isBefore(oneMonthAgo)) {
                     console.log('adminDeleteUser prossing...', user.Username, sub);
                     const adminDeleteUserResult = await newPersonRepo.cognitoIdentityServiceProvider.adminDeleteUser({
-                        UserPoolId: USERPOOL_ID_NEW,
+                        UserPoolId: userPoolId,
                         Username: user.Username
                     });
                     console.log('adminDeleteUser processed.', user.Username, sub, adminDeleteUserResult);
@@ -83,6 +91,8 @@ async function main(): Promise<void> {
 
         }
     }
+
+    console.log(users.length, 'users processed');
 }
 
 main()

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

@@ -0,0 +1,143 @@
+// tslint:disable:no-console
+import { CognitoIdentityProvider, ListUsersInGroupCommandOutput, UserType } from '@aws-sdk/client-cognito-identity-provider';
+import { fromEnv } from '@aws-sdk/credential-providers';
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const TIMEOUT_MS = 5000;
+const USERPOOL_PROVIDER_NAME = 'SSKTS';
+
+// tslint:disable-next-line:max-func-body-length
+async function main(): Promise<void> {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
+    const setting = await settingRepo.findOne({ project: { id: { $eq: '*' } } }, ['userPoolIdNew']);
+    if (typeof setting?.userPoolIdNew !== 'string') {
+        throw new chevre.factory.errors.NotFound('setting.userPoolIdNew');
+    }
+    const userPoolId: string = setting.userPoolIdNew;
+    const USER_GROUP_NAME = `${userPoolId}_${USERPOOL_PROVIDER_NAME}`; // 'ap-northeast-1_XXXXXXXXX_SSKTS',
+
+    const awsCredentials = fromEnv();
+    const cognitoIdentityServiceProvider = new CognitoIdentityProvider({
+        apiVersion: 'latest',
+        region: 'ap-northeast-1',
+        credentials: awsCredentials
+    });
+
+    // create user
+    const newPersonRepo = await chevre.repository.Person.createInstance({
+        userPoolId: userPoolId,
+        cognitoIdentityServiceProvider
+    });
+
+    const users: UserType[] = [];
+    let nextToken: string | undefined = '';
+    let page: number = 0;
+    while (typeof nextToken === 'string') {
+        // tslint:disable-next-line:no-magic-numbers
+        if (page > 2000) {
+            break;
+        }
+
+        page += 1;
+        console.log('listUsersInGroup processing...', nextToken, page);
+        const listUsersInGroupResult = <ListUsersInGroupCommandOutput>await newPersonRepo.cognitoIdentityServiceProvider.listUsersInGroup(
+            {
+                Limit: 50,
+                // Limit: 1,
+                UserPoolId: userPoolId,
+                GroupName: USER_GROUP_NAME,
+                ...(typeof nextToken === 'string' && nextToken !== '') ? { NextToken: nextToken } : undefined
+            }
+        );
+        // tslint:disable-next-line:no-null-keyword
+        console.dir(listUsersInGroupResult.Users?.at(0), { depth: null });
+        nextToken = listUsersInGroupResult.NextToken;
+        if (Array.isArray(listUsersInGroupResult.Users)) {
+            users.push(...listUsersInGroupResult.Users);
+        }
+    }
+    console.log('listUsersInGroup processed', nextToken, page);
+    console.log(users.length, 'users found');
+
+    const oneMonthAgo = moment()
+        .add(-1, 'months');
+    let i = 0;
+    for (const user of users) {
+        i += 1;
+        await new Promise<void>((resolve) => {
+            setTimeout(
+                () => {
+                    resolve();
+                },
+                // tslint:disable-next-line:no-magic-numbers
+                500
+            );
+        });
+        const isSSKTSMember = user.Username?.startsWith(USERPOOL_PROVIDER_NAME, 0);
+        if (!isSSKTSMember) {
+            console.error(user);
+            throw new Error('not ssktsMember');
+        }
+
+        const sub = user.Attributes?.find(({ Name }) => Name === 'sub')?.Value;
+        // if (user.Enabled === true && sub === '46686164-2c18-491a-8594-52c944d895e9') {
+        if (user.Enabled === true) {
+            console.log('disabling...', user.Username, sub, i);
+            // disable link provider
+            // const adminDisableUserResult = await newPersonRepo.cognitoIdentityServiceProvider.adminDisableUser({
+            //     UserPoolId: userPoolId,
+            //     Username: user.Username
+            // });
+            // console.log('disabled.', user.Username, sub, adminDisableUserResult);
+        } else {
+            if (user.UserLastModifiedDate instanceof Date) {
+                if (moment(user.UserLastModifiedDate)
+                    .isBefore(oneMonthAgo)) {
+                    console.log('adminDeleteUser prossing...', user.Username, sub, i);
+
+                    // const adminDeleteUserResult = await newPersonRepo.cognitoIdentityServiceProvider.adminDeleteUser({
+                    //     UserPoolId: userPoolId,
+                    //     Username: user.Username
+                    // });
+                    try {
+                        const url = `${String(process.env.DISCONTINUE_PEOPLE_URL)}?personId=${sub}`;
+                        const res = await fetch(
+                            url,
+                            {
+                                signal: AbortSignal.timeout(TIMEOUT_MS),
+                                method: 'GET'
+                            }
+                        );
+                        // const result = await res.text();
+                        console.log('res.status', res.status, user.Username, sub, i);
+                    } catch (err) {
+                        console.error(err);
+                        if (err.name === 'TimeoutError') {
+                            console.error('Timeout: It took more than 5 seconds to get the result!');
+                        } else if (err.name === 'AbortError') {
+                            console.error('Fetch aborted by user action (browser stop button, closing tab, etc.');
+                        } else if (err.name === 'TypeError') {
+                            console.error('AbortSignal.timeout() method is not supported');
+                        } else {
+                            // A network error, or some other problem.
+                            console.error(`Error: type: ${err.name}, message: ${err.message}`);
+                        }
+                    }
+
+                    console.log('adminDeleteUser processed.', user.Username, sub, i);
+                }
+            }
+        }
+    }
+
+    console.log(users.length, 'users processed');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -1,6 +1,5 @@
 import type { EventRepo } from '../repo/event';
 import type { SeatRepo } from '../repo/place/seat';
-import type { PriceSpecificationRepo } from '../repo/priceSpecification';
 import type { StockHolderRepo } from '../repo/stockHolder';
 import * as factory from '../factory';
 import * as EventOfferService from './offer/event';
@@ -20,7 +19,12 @@ export declare function addOffers2Seat(params: {
      */
     priceSpecs: ICategoryCodeChargeSpecification[];
 }): factory.place.seat.IPlaceWithOffer;
-type ISeatAsEventOffer = Pick<factory.place.seat.IPlaceWithOffer, 'branchCode' | 'containedInPlace' | 'offers' | 'seatingType' | 'typeOf' | 'name'>;
+type ISeatAsEventOffer = Pick<factory.place.seat.IPlaceWithOffer, 'branchCode' | 'name' | 'seatingType'> & {
+    containedInPlace?: {
+        branchCode?: string;
+    };
+    offers?: Pick<factory.place.seat.IOffer, 'availability'>[];
+};
 /**
  * イベントに対する座席オファーを検索する
  */
@@ -39,15 +43,9 @@ export declare function searchEventSeatOffersWithPaging(params: {
         id: string;
     };
     $projection?: factory.place.seat.IProjection;
-    options: {
-        /**
-         * add option(2024-10-23~)
-         */
-        excludePriceSpecification: boolean;
-    };
+    options: {};
 }): (repos: {
     event: EventRepo;
-    priceSpecification: PriceSpecificationRepo;
     stockHolder: StockHolderRepo;
     seat: SeatRepo;
 }) => Promise<ISeatAsEventOffer[]>;

package/lib/chevre/service/offer.js

@@ -60,7 +60,7 @@ function searchEventSeatOffersWithPaging(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        const { excludePriceSpecification } = params.options;
+        // const { excludePriceSpecification } = params.options;
         let offers = [];
         // optimize(2024-07-18~)
         const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered']);
@@ -99,36 +99,37 @@ function searchEventSeatOffersWithPaging(params) {
                     })
                 });
                 // ルームに含まれる座席区分のみ加算料金を検索(2024-08-05~)
-                const uniqueSeatingTypes = yield repos.seat.aggregateSeatingTypes({
-                    project: { id: { $eq: event.project.id } },
-                    containedInPlace: {
-                        containedInPlace: {
-                            branchCode: { $eq: roomBranchCode },
-                            containedInPlace: { branchCode: { $eq: movieTheaterBranchCode } }
-                        }
-                    }
-                });
+                // const uniqueSeatingTypes = await repos.seat.aggregateSeatingTypes({
+                //     project: { id: { $eq: event.project.id } },
+                //     containedInPlace: {
+                //         containedInPlace: {
+                //             branchCode: { $eq: roomBranchCode },
+                //             containedInPlace: { branchCode: { $eq: movieTheaterBranchCode } }
+                //         }
+                //     }
+                // });
                 // 座席タイプ価格仕様を検索
-                let priceSpecs = [];
-                if (!excludePriceSpecification) {
-                    if (Array.isArray(uniqueSeatingTypes) && uniqueSeatingTypes.length > 0) {
-                        priceSpecs = yield repos.priceSpecification.search({
-                            project: { id: { $eq: event.project.id } },
-                            typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                            appliesToCategoryCode: {
-                                inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } },
-                                codeValue: { $in: uniqueSeatingTypes } // ルームに含まれる座席区分のみ加算料金を検索(2024-08-05~)
-                            }
-                        });
-                    }
-                }
+                // let priceSpecs: ICategoryCodeChargeSpecification[] = [];
+                // if (!excludePriceSpecification) {
+                //     if (Array.isArray(uniqueSeatingTypes) && uniqueSeatingTypes.length > 0) {
+                //         priceSpecs =
+                //             await repos.priceSpecification.search<factory.priceSpecificationType.CategoryCodeChargeSpecification>({
+                //                 project: { id: { $eq: event.project.id } },
+                //                 typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                //                 appliesToCategoryCode: {
+                //                     inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } },
+                //                     codeValue: { $in: uniqueSeatingTypes } // ルームに含まれる座席区分のみ加算料金を検索(2024-08-05~)
+                //                 }
+                //             });
+                //     }
+                // }
                 offers = seats.map((seat, index) => {
                     return addOffers2Seat({
                         seat,
                         availability: (typeof availabilities[index] === 'string')
                             ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
                             : factory.itemAvailability.InStock,
-                        priceSpecs
+                        priceSpecs: [] // priceSpecsをレスポンスから廃止(2024-12-22~)
                     });
                 });
             }

package/package.json

@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.7.0-alpha.18"
+  "version": "22.7.0-alpha.19"
 }