@chevre/domain 21.20.1 → 21.21.0-alpha.1

package/lib/chevre/credentials.d.ts

@@ -5,6 +5,7 @@ export declare const credentials: {
     aws: {
         accessKeyId: string;
         secretAccessKey: string;
+        tokenIssuerEndpoint: string;
     };
     chevre: {
         authorizeServerDomain: string;

package/lib/chevre/credentials.js

@@ -7,7 +7,8 @@ exports.credentials = void 0;
 exports.credentials = {
     aws: {
         accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY
+        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+        tokenIssuerEndpoint: process.env.TOKEN_ISSUER_ENDPOINT
     },
     chevre: {
         authorizeServerDomain: process.env.CHEVRE_AUTHORIZE_SERVER_DOMAIN,

package/lib/chevre/repo/person.js

@@ -15,7 +15,6 @@ const credential_providers_1 = require("@aws-sdk/credential-providers");
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory = require("../factory");
 const awsCredentials = (0, credential_providers_1.fromEnv)();
-const TOKEN_ISSUER_ENDPOINT = 'https://cognito-idp.ap-northeast-1.amazonaws.com';
 /**
  * 会員リポジトリ
  */
@@ -78,7 +77,9 @@ class CognitoRepository {
         const profile = CognitoRepository.ATTRIBUTE2PROFILE(params);
         const identifier = [];
         if (typeof params.userPoolId === 'string') {
-            identifier.push({ name: 'iss', value: `${TOKEN_ISSUER_ENDPOINT}/${params.userPoolId}` });
+            // identifier.push(
+            //     { name: 'iss', value: `${credentials.aws.tokenIssuerEndpoint}/${params.userPoolId}` }
+            // );
         }
         const person = Object.assign(Object.assign({}, profile), { typeOf: factory.personType.Person, id: '', identifier: identifier, memberOf: {
                 membershipNumber: params.username,

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

@@ -82,6 +82,10 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
+    addAvailableAtOrFrom(params: {
+        id: string;
+        makesOffer: factory.seller.IMakesOffer;
+    }): Promise<any>;
     getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     unsetUnnecessaryFields(params: {
         filter: any;

package/lib/chevre/repo/seller.js

@@ -303,6 +303,12 @@ class MongoRepository {
                 .exec();
         });
     }
+    addAvailableAtOrFrom(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.organizationModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $push: { makesOffer: params.makesOffer } })
+                .exec();
+        });
+    }
     getCursor(conditions, projection) {
         return this.organizationModel.find(conditions, projection)
             .sort({ branchCode: factory.sortType.Ascending })

package/package.json

@@ -111,5 +111,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.1"
+  "version": "21.21.0-alpha.1"
 }

package/example/src/chevre/migrateEventMakesOfferAvailableAtOrFrom.ts

@@ -1,87 +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 OLD_CLIENT = String(process.env.OLD_CLIENT);
-const NEW_CLIENT = String(process.env.NEW_CLIENT);
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            'project.id': { $eq: project.id },
-            // _id: { $eq: 'als04raei' },
-            'offers.seller.makesOffer.availableAtOrFrom.id': { $eq: OLD_CLIENT },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent }
-        },
-        {
-            _id: 1,
-            offers: 1,
-            project: 1,
-            startDate: 1
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: Pick<
-            chevre.factory.event.screeningEvent.IEvent,
-            'id' | 'offers' | 'project' | 'startDate'
-        > = doc.toObject();
-
-        const eventOffers = <chevre.factory.event.screeningEvent.IOffer>event.offers;
-        const alreadyMigrated = eventOffers.seller.makesOffer.some(
-            ({ availableAtOrFrom }) => availableAtOrFrom?.some((({ id }) => id === NEW_CLIENT))
-        );
-        const offerOnOldClient = eventOffers.seller.makesOffer.find(
-            ({ availableAtOrFrom }) => availableAtOrFrom?.some((({ id }) => id === OLD_CLIENT))
-        );
-        if (offerOnOldClient === undefined) {
-            throw new Error('!oldClientExists');
-        }
-
-        if (alreadyMigrated) {
-            await eventRepo.deleteAvailableAtOrFrom({
-                id: String(event.id),
-                offers: {
-                    seller: {
-                        makesOffer: { availableAtOrFrom: { id: OLD_CLIENT } }
-                    }
-                }
-            });
-            console.log('already exist.', event.project.id, event.id, event.startDate, i);
-        } else {
-            const offerNewOldClient: chevre.factory.event.screeningEvent.ISellerMakesOffer = {
-                ...offerOnOldClient,
-                availableAtOrFrom: [{ id: NEW_CLIENT }]
-            };
-            console.log('updating...', event.project.id, event.id, event.startDate, i);
-            await eventRepo.addAvailableAtOrFrom({
-                id: String(event.id),
-                offers: {
-                    seller: {
-                        makesOffer: offerNewOldClient
-                    }
-                }
-            });
-            updateCount += 1;
-            console.log('updated.', event.project.id, event.id, event.startDate, i);
-        }
-    });
-
-    console.log(i, 'offers checked');
-    console.log(updateCount, 'offers updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migrateOfferAvailableAtOrFrom.ts

@@ -1,63 +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 OLD_CLIENT = String(process.env.OLD_CLIENT);
-const NEW_CLIENT = String(process.env.NEW_CLIENT);
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const offerRepo = await chevre.repository.Offer.createInstance(mongoose.connection);
-
-    const cursor = offerRepo.getCursor(
-        {
-            'project.id': { $eq: project.id },
-            // _id: { $eq: 'blqm9a6ui' },
-            'offers.availableAtOrFrom.id': { $eq: OLD_CLIENT }
-        },
-        {
-            _id: 1,
-            offers: 1,
-            project: 1
-        }
-    );
-    console.log('offers found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const aggregateOffer: chevre.factory.aggregateOffer.IAggregateOffer = doc.toObject();
-
-        const alreadyMigrated = aggregateOffer.offers[0].availableAtOrFrom?.some(({ id }) => id === NEW_CLIENT);
-        console.log(aggregateOffer.offers[0].availableAtOrFrom, i);
-
-        if (alreadyMigrated) {
-            await offerRepo.deleteAvailableAtOrFrom({
-                id: String(aggregateOffer.id),
-                offers: { availableAtOrFrom: { id: OLD_CLIENT } }
-            });
-            console.log('already exist.', aggregateOffer.project.id, aggregateOffer.id, i);
-        } else {
-            console.log('updating...', aggregateOffer.project.id, aggregateOffer.id, i);
-            await offerRepo.addAvailableAtOrFrom({
-                id: String(aggregateOffer.id),
-                identifier: aggregateOffer.offers[0].identifier,
-                offers: { availableAtOrFrom: { id: NEW_CLIENT } }
-            });
-            updateCount += 1;
-            console.log('updated.', aggregateOffer.project.id, aggregateOffer.id, i);
-        }
-    });
-
-    console.log(i, 'offers checked');
-    console.log(updateCount, 'offers updated');
-}
-
-main()
-    .then()
-    .catch(console.error);