@chevre/domain 21.20.0 → 21.21.0-alpha.0

package/example/src/chevre/migrateDeleteTransactionTasks.ts

@@ -20,11 +20,11 @@ async function main() {
             runsAt: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(150, 'days')
+                    .add(153, 'days')
                     .toDate(),
                 $lte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(200, 'days')
+                    .add(180, 'days')
                     .toDate()
             }
             // _id: { $eq: '64aba5f37b8b8ef9eca60be5' }

package/example/src/chevre/transaction/processPlaceOrder.ts

@@ -71,7 +71,6 @@ async function main() {
         paymentAccepted: await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection),
         paymentService: await chevre.repository.PaymentService.createInstance(mongoose.connection),
         paymentServiceProvider: await chevre.repository.PaymentServiceProvider.createInstance(mongoose.connection),
-        person: await chevre.repository.Person.createInstance({ userPoolId: '' }),
         transactionNumber: await chevre.repository.TransactionNumber.createInstance(client),
         transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
     });
@@ -128,7 +127,6 @@ async function main() {
                                 paymentAccepted: await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection),
                                 paymentService: await chevre.repository.PaymentService.createInstance(mongoose.connection),
                                 paymentServiceProvider: await chevre.repository.PaymentServiceProvider.createInstance(mongoose.connection),
-                                person: await chevre.repository.Person.createInstance({ userPoolId: '' }),
                                 product: await chevre.repository.Product.createInstance(mongoose.connection),
                                 task: await chevre.repository.Task.createInstance(mongoose.connection),
                                 transactionNumber: await chevre.repository.TransactionNumber.createInstance(client),

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/lib/chevre/service/assetTransaction/pay.d.ts

@@ -11,7 +11,6 @@ import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
-import type { CognitoRepository as PersonRepo } from '../../repo/person';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
@@ -25,7 +24,6 @@ export interface IStartOperationRepos {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    person: PersonRepo;
     product: ProductRepo;
     assetTransaction: AssetTransactionRepo;
     task: TaskRepo;
@@ -60,7 +58,6 @@ export type IPublishPaymentUrlOperation<T> = (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    person: PersonRepo;
 }) => Promise<T>;
 export type IInvalidatePaymentUrlOperation<T> = (repos: {
     accountingReport: AccountingReportRepo;

package/lib/chevre/service/payment/any.d.ts

@@ -8,7 +8,6 @@ import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTr
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
-import type { CognitoRepository as PersonRepo } from '../../repo/person';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
@@ -60,7 +59,6 @@ interface IAuthorizeRepos {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    person: PersonRepo;
     product: ProductRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
@@ -72,7 +70,6 @@ interface IPublishPaymentUrlRepos {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    person: PersonRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }

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

@@ -20,7 +20,6 @@ const credentials_1 = require("../../credentials");
 const factory = require("../../factory");
 const onPaid_1 = require("./any/onPaid");
 const onRefund_1 = require("./any/onRefund");
-// import { person2username } from './any/person2username';
 const debug = createDebug('chevre-domain:service:payment');
 /**
  * クレジットカード決済承認
@@ -28,11 +27,6 @@ const debug = createDebug('chevre-domain:service:payment');
 function authorize(params, paymentServiceId, options) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // const project = <Pick<factory.project.IProject, 'settings'>>await repos.project.findById({
-        //     id: params.project.id,
-        //     inclusion: ['settings'],
-        //     exclusion: []
-        // });
         var _a, _b, _c, _d, _e;
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;

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.0"
+  "version": "21.21.0-alpha.0"
 }

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);