@chevre/domain 22.5.0-alpha.23 → 22.5.0-alpha.24

package/example/src/chevre/migrateSellerMakesOfferAvailableAt.ts

@@ -14,7 +14,7 @@ async function main() {
 
     const cursor = sellerRepo.getCursor(
         {
-            _id: { $eq: '59d20831e53ebc2b4e774466' }
+            // _id: { $eq: '5a392dfdfca1c8737fb6da42' }
         },
         {
             _id: 1,
@@ -66,12 +66,13 @@ async function main() {
                 console.log(
                     'updating project...',
                     seller.project.id, seller.typeOf, seller.id, seller.name?.ja, i, newMakesOffer);
-                // await sellerRepo.save({
-                //     id: String(seller.id),
-                //     attributes: <any>{
-                //         makesOffer: newMakesOffer
-                //     }
-                // });
+                await sellerRepo.save({
+                    id: String(seller.id),
+                    attributes: <any>{
+                        project: seller.project,
+                        makesOffer: newMakesOffer
+                    }
+                });
                 updateCount += 1;
                 console.log(
                     'updated.',

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

@@ -0,0 +1,89 @@
+// tslint:disable:no-console
+import { CognitoIdentityProvider, UserType } from '@aws-sdk/client-cognito-identity-provider';
+import { fromEnv } from '@aws-sdk/credential-providers';
+import * as moment from 'moment';
+
+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 NEW_USERPOOL_PROVIDER_NAME = 'SSKTS';
+
+// tslint:disable-next-line:max-func-body-length
+async function main(): Promise<void> {
+    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: USERPOOL_ID_NEW,
+        cognitoIdentityServiceProvider
+    });
+
+    const users: UserType[] = [];
+    let nextToken: string | undefined = '';
+    let page: number = 0;
+    while (typeof nextToken === 'string') {
+        page += 1;
+        console.log('listUsersInGroup processing...', nextToken, page);
+        const listUsersInGroupResult = await newPersonRepo.cognitoIdentityServiceProvider.listUsersInGroup(
+            {
+                Limit: 50,
+                UserPoolId: USERPOOL_ID_NEW,
+                GroupName: 'ap-northeast-1_UWLLyMcjt_SSKTS',
+                ...(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');
+    for (const user of users) {
+        const isSSKTSMember = user.Username?.startsWith(NEW_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);
+            // disable link provider
+            const adminDisableUserResult = await newPersonRepo.cognitoIdentityServiceProvider.adminDisableUser({
+                UserPoolId: USERPOOL_ID_NEW,
+                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);
+                    const adminDeleteUserResult = await newPersonRepo.cognitoIdentityServiceProvider.adminDeleteUser({
+                        UserPoolId: USERPOOL_ID_NEW,
+                        Username: user.Username
+                    });
+                    console.log('adminDeleteUser processed.', user.Username, sub, adminDeleteUserResult);
+                }
+            }
+
+        }
+    }
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/searchSellersByAggregate.ts

@@ -12,15 +12,14 @@ async function main() {
 
     const sellersByAggregate = await sellerRepo.searchByAggregate(
         {
-            limit: 5,
+            limit: 1,
             page: 1,
-            sort: { branchCode: chevre.factory.sortType.Descending },
-            id: { $eq: '59d20831e53ebc2b4e774466' }
+            sort: { branchCode: chevre.factory.sortType.Descending }
+            // id: { $eq: '59d20831e53ebc2b4e774466' }
             // project: { id: { $eq: project.id } }
             // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
             // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
         },
-        [],
         ['hasMerchantReturnPolicy', 'additionalProperty', 'project', 'name', 'typeOf', 'url', 'telephone']
     );
     console.log('sellers found', sellersByAggregate, sellersByAggregate[0]?.hasMerchantReturnPolicy);

package/lib/chevre/repo/creativeWork.js

@@ -228,9 +228,7 @@ class CreativeWorkRepo {
     /**
      * コンテンツを検索する
      */
-    projectFields(params, inclusion
-    // exclusion: IKeyOfProjection[]
-    ) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = CreativeWorkRepo.CREATE_MONGO_CONDITIONS(params);

package/lib/chevre/repo/place/movieTheater.js

@@ -173,9 +173,7 @@ class MovieTheaterRepo {
      * 施設検索
      * redefine(2024-09-18~)
      */
-    projectFields(params, inclusion
-    // exclusion: IKeyOfProjection[]
-    ) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MovieTheaterRepo.CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params);

package/lib/chevre/repo/product.js

@@ -174,9 +174,7 @@ class ProductRepo {
     /**
      * プロダクトを検索する
      */
-    projectFields(conditions, inclusion
-    // exclusion: IKeyOfProjection[] // discontinue(2024-09-28~)
-    ) {
+    projectFields(conditions, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = ProductRepo.CREATE_MONGO_CONDITIONS(conditions);

package/lib/chevre/repo/project.js

@@ -92,9 +92,7 @@ class ProjectRepo {
     /**
      * プロジェクト検索
      */
-    projectFields(conditions, inclusion
-    // exclusion: IKeyOfProjection[] // discontinue(2024-10-09~)
-    ) {
+    projectFields(conditions, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = ProjectRepo.CREATE_MONGO_CONDITIONS(conditions);

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

@@ -33,7 +33,9 @@ interface IUnset {
         [key: string]: 1;
     };
 }
-type ISellerByAggregate = Pick<ISellerWithId, 'additionalProperty' | 'branchCode' | 'hasMerchantReturnPolicy' | 'id' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'>;
+type ISellerByAggregate = Pick<ISellerWithId, 'additionalProperty' | 'branchCode' | 'id' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'> & {
+    hasMerchantReturnPolicy?: Pick<factory.seller.ISellerMerchantReturnPolicy, 'typeOf' | 'url'>[];
+};
 interface IMemberSearchConditions {
     /**
      * 販売者メンバーで絞る場合
@@ -56,7 +58,7 @@ export declare class SellerRepo {
     private readonly sellerModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions & IMemberSearchConditions): FilterQuery<factory.seller.ISeller>[];
-    static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusion: string[], exclusion: (keyof ISellerByAggregate)[]): {
+    static CREATE_AGGREGATE_SELLERS_PROJECTION(exclusion: (keyof ISellerByAggregate)[]): {
         [field: string]: AnyExpression;
     };
     /**
@@ -71,7 +73,7 @@ export declare class SellerRepo {
     /**
      * 集計検索(publicな属性検索が目的)
      */
-    searchByAggregate(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: (keyof ISellerByAggregate)[], exclusion: (keyof ISellerByAggregate)[]): Promise<ISellerByAggregate[]>;
+    searchByAggregate(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, exclusion: (keyof ISellerByAggregate)[]): Promise<ISellerByAggregate[]>;
     /**
      * 販売者検索
      */

package/lib/chevre/repo/seller.js

@@ -157,7 +157,9 @@ class SellerRepo {
         }
         return andConditions;
     }
-    static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusion, exclusion) {
+    static CREATE_AGGREGATE_SELLERS_PROJECTION(
+    // inclusion: string[], // discontinue(2024-10-20~)
+    exclusion) {
         const projectStage = {
             _id: 0,
             id: { $toString: '$_id' },
@@ -185,10 +187,10 @@ class SellerRepo {
             url: '$url',
             telephone: '$telephone'
         };
-        if (inclusion.length > 0) {
-            // no op
-        }
-        else if (exclusion.length > 0) {
+        // if (inclusion.length > 0) {
+        //     // no op
+        // } else
+        if (exclusion.length > 0) {
             exclusion.forEach((field) => {
                 if (typeof projectStage[field] === 'string' || typeof projectStage[field] === 'object') {
                     // tslint:disable-next-line:no-dynamic-delete
@@ -247,12 +249,15 @@ class SellerRepo {
     /**
      * 集計検索(publicな属性検索が目的)
      */
-    searchByAggregate(conditions, inclusion, exclusion) {
+    searchByAggregate(conditions, 
+    // inclusion: (keyof ISellerByAggregate)[], // discontinue(2024-10-20~)
+    exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = SellerRepo.CREATE_MONGO_CONDITIONS(conditions)
                 .map((c) => ({ $match: c }));
-            const projectStage = SellerRepo.CREATE_AGGREGATE_SELLERS_PROJECTION(inclusion, exclusion);
+            // const projectStage = SellerRepo.CREATE_AGGREGATE_SELLERS_PROJECTION(inclusion, exclusion);
+            const projectStage = SellerRepo.CREATE_AGGREGATE_SELLERS_PROJECTION(exclusion);
             const sortByBranchCode = (_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.branchCode;
             const aggregate = this.sellerModel.aggregate([
                 ...matchStages,

package/lib/chevre/service/aggregation/project.js

@@ -24,7 +24,6 @@ function aggregate(params) {
         const project = yield repos.project.findById({
             id: params.project.id,
             inclusion: ['typeOf']
-            // exclusion: []
         });
         // 予約集計
         const { aggregateReservation } = yield aggregateReservationOnProject({

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

@@ -86,7 +86,6 @@ function start(params) {
         const project = yield repos.project.findById({
             id: params.project.id,
             inclusion: ['typeOf']
-            // exclusion: []
         });
         const { reserveTransaction, reservations } = yield validateStartParams(params)(repos);
         const transactionNumber = params.transactionNumber;
@@ -142,7 +141,6 @@ function startAndConfirm(params) {
         const project = yield repos.project.findById({
             id: params.project.id,
             inclusion: ['typeOf']
-            // exclusion: []
         });
         const { reserveTransaction, reservations } = yield validateStartParams(params)(repos);
         const transactionNumber = params.transactionNumber;

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

@@ -28,7 +28,6 @@ function start(params) {
         const project = yield repos.project.findById({
             id: params.project.id,
             inclusion: ['typeOf']
-            // exclusion: []
         });
         // objectはオファー
         let acceptedOffers = params.object;

package/lib/chevre/service/moneyTransfer.js

@@ -25,7 +25,6 @@ function authorize(params) {
         const project = yield repos.project.findById({
             id: params.project.id,
             inclusion: ['settings', 'typeOf']
-            // exclusion: []
         });
         const transaction = yield repos.assetTransaction.findById({
             typeOf: params.purpose.typeOf,

package/lib/chevre/service/notification.js

@@ -31,7 +31,6 @@ function sendEmailMessage(params) {
         const project = yield repos.project.findById({
             id: params.project.id,
             inclusion: ['settings']
-            // exclusion: []
         });
         const action = yield repos.action.start(createSendEmailMessageActionAttributes(params));
         let result = {};

package/lib/chevre/service/payment/paymentCard.js

@@ -22,11 +22,6 @@ const onRefund_1 = require("./any/onRefund");
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
 function authorize(params, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // const project = <Pick<factory.project.IProject, 'id' | 'typeOf'>>await repos.project.findById({
-        //     id: params.project.id,
-        //     inclusion: ['_id', 'typeOf'],
-        //     exclusion: []
-        // });
         var _a;
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string') {

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

@@ -44,7 +44,6 @@ function findByCode(params) {
         const reservationFromRepo = yield repos.reservation.projectFieldsById({
             id: reservationId,
             inclusion: ['additionalTicketText', 'checkedIn', 'reservationStatus', 'reservedTicket']
-            // exclusion: [] // discontinue(2024-08-08~)
         });
         const { id, additionalTicketText, checkedIn, reservationStatus, reservedTicket } = reservationFromRepo;
         const reservation = Object.assign(Object.assign({ id, reservationStatus, reservedTicket: {

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

@@ -97,7 +97,6 @@ function deleteById(params) {
             const project = yield repos.project.findById({
                 id: params.project.id,
                 inclusion: ['settings']
-                // exclusion: []
             });
             // const useUsernameAsGMOMemberId = project.settings?.useUsernameAsGMOMemberId === true;
             // 移行の場合、全所有権情報通知タスクを作成

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -79,7 +79,6 @@ function preStart(params) {
         const { hasMerchantReturnPolicy } = yield repos.project.findById({
             id: seller.project.id,
             inclusion: ['hasMerchantReturnPolicy']
-            // exclusion: []
         });
         const appliedReturnPolicy = yield findApplicableReturnPolicy(Object.assign({ acceptedOffers,
             events,

package/package.json

@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.5.0-alpha.23"
+  "version": "22.5.0-alpha.24"
 }