@chevre/domain 21.4.0-alpha.0 → 21.4.0-alpha.10

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

@@ -27,6 +27,7 @@ const onRefund_1 = require("./any/onRefund");
 /**
  * MovieTicket認証
  */
+// tslint:disable-next-line:max-func-body-length
 function checkMovieTicket(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
@@ -58,7 +59,15 @@ function checkMovieTicket(params) {
                 id: eventIds[0]
             });
             // ショップ情報取得
-            const seller = yield repos.seller.findById({ id: (_e = params.object[0]) === null || _e === void 0 ? void 0 : _e.seller.id }, ['paymentAccepted', 'project'], []);
+            const sellers = yield repos.seller.search({
+                limit: 1,
+                page: 1,
+                id: { $eq: (_e = params.object[0]) === null || _e === void 0 ? void 0 : _e.seller.id }
+            }, ['paymentAccepted', 'project'], []);
+            const seller = sellers.shift();
+            if (seller === undefined) {
+                throw new factory.errors.NotFound(factory.organizationType.Corporation);
+            }
             const paymentAccepted = (_f = seller.paymentAccepted) === null || _f === void 0 ? void 0 : _f.some((a) => a.paymentMethodType === paymentMethodType);
             if (paymentAccepted !== true) {
                 throw new factory.errors.Argument('transactionId', 'payment not accepted');
@@ -302,7 +311,15 @@ function payActionParams2seatInfoSyncIn(params) {
         // イベント取得属性最適化(2023-01-23~)
         // const event = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: eventIds[0] });
         const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] });
-        const seller = yield repos.seller.findById({ id: String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id) }, ['paymentAccepted', 'project'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id) }
+        }, ['paymentAccepted', 'project'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         // 全購入管理番号のMovieTicketをマージ
         const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);
         const sellerCredentials = yield (0, getCredentials_1.getCredentials)({ paymentMethodType, seller, paymentServiceId })(repos);

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -28,7 +28,15 @@ const CodeService = require("../code");
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const seller = yield repos.seller.findById({ id: params.seller.id }, ['name', 'typeOf'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.seller.id }
+        }, ['name', 'typeOf'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const passport = yield (0, validation_1.validateWaiterPassport)(params);
         // 金額をfix
         const amount = params.object.amount;

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

@@ -29,12 +29,15 @@ exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const seller = yield repos.seller.findById({ id: params.seller.id }, ['name', 'project', 'typeOf', 'makesOffer'], []
-        // {
-        //     hasMerchantReturnPolicy: 0,
-        //     paymentAccepted: 0
-        // }
-        );
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.seller.id }
+        }, ['name', 'project', 'typeOf', 'makesOffer'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         let makesOfferFromClient;
         // 販売者オファー検証(2022-10-14~)
         if (params.validateSeller === true) {

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

@@ -29,9 +29,15 @@ function start(params) {
         const now = new Date();
         const { acceptedOffers, eventIds, offerIds, orders } = yield fixOrders(params)(repos);
         // sellerはorderから自動取得
-        const seller = yield repos.seller.findById({ id: String(orders[0].seller.id) }, ['name', 'project', 'hasMerchantReturnPolicy', 'typeOf'], []
-        // { additionalProperty: 0, paymentAccepted: 0 }
-        );
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: String(orders[0].seller.id) }
+        }, ['name', 'project', 'hasMerchantReturnPolicy', 'typeOf'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         yield validateOrder({ orders })(repos);
         let offers = [];
         if (offerIds.length > 0) {

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.314.0",
-    "@cinerino/sdk": "3.157.1",
+    "@chevre/factory": "4.315.0-alpha.2",
+    "@cinerino/sdk": "3.160.0-alpha.3",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.4.0-alpha.0"
+  "version": "21.4.0-alpha.10"
 }

package/example/src/chevre/migrateEventOffersItemOfferedAvailableChannel.ts

@@ -1,90 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
-            startDate: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-6, 'months')
-                    .toDate()
-            }
-            // _id: { $eq: 'al6aff83w' }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: chevre.factory.event.screeningEvent.IEvent = doc.toObject();
-
-        const eventOffers = <chevre.factory.event.screeningEvent.IOffer | undefined>event.offers;
-        if (eventOffers === undefined) {
-            throw new Error('event.offers undefined');
-        }
-
-        const availableChannel = eventOffers.itemOffered.availableChannel;
-
-        const alreadyMigrated = availableChannel?.typeOf === 'ServiceChannel';
-
-        if (alreadyMigrated) {
-            console.log(
-                'already exist...', event.project.id, event.id, event.startDate, availableChannel.serviceLocation.branchCode, i);
-        } else {
-            const newAvailableChannel: chevre.factory.reservation.IServiceChannel = {
-                typeOf: 'ServiceChannel',
-                serviceLocation: {
-                    typeOf: event.location.typeOf,
-                    branchCode: event.location.branchCode,
-                    name: event.location.name,
-                    containedInPlace: {
-                        typeOf: event.superEvent.location.typeOf,
-                        id: event.superEvent.location.id,
-                        branchCode: event.superEvent.location.branchCode,
-                        name: event.superEvent.location.name
-                    }
-                }
-            };
-            console.log(
-                'updating seller...', event.project.id, event.id, event.startDate, newAvailableChannel.serviceLocation.branchCode, i);
-            await eventRepo.updatePartiallyById({
-                id: event.id,
-                attributes: <any>{
-                    typeOf: event.typeOf,
-                    'offers.itemOffered.availableChannel': newAvailableChannel
-                }
-            });
-            updateCount += 1;
-            console.log(
-                'updated...', event.project.id, event.id, event.startDate, i);
-        }
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migrateEventOffersItemOfferedTypeOf.ts

@@ -1,75 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
-            startDate: {
-                $gte: moment()
-                    .add(-1, 'month')
-                    .toDate()
-            }
-            // _id: { $eq: 'al6aff83w' }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: chevre.factory.event.screeningEvent.IEvent = doc.toObject();
-
-        // IAMメンバー検索
-        const eventOffers = <chevre.factory.event.screeningEvent.IOffer | undefined>event.offers;
-        if (eventOffers === undefined) {
-            throw new Error('event.offers undefined');
-        }
-
-        const itemOfferedTypeOf = eventOffers.itemOffered.typeOf;
-
-        const alreadyMigrated = itemOfferedTypeOf === chevre.factory.product.ProductType.EventService;
-
-        if (alreadyMigrated) {
-            console.log(
-                'already exist...', event.project.id, event.id, event.startDate, itemOfferedTypeOf, i);
-        } else {
-            console.log(
-                'updating seller...', event.project.id, event.id, event.startDate, i);
-            await eventRepo.updatePartiallyById({
-                id: event.id,
-                attributes: <any>{
-                    typeOf: event.typeOf,
-                    'offers.itemOffered.typeOf': chevre.factory.product.ProductType.EventService
-                }
-            });
-            updateCount += 1;
-            console.log(
-                'updated...', event.project.id, event.id, event.startDate, i);
-        }
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migrateSSKTEventCOAEndpoint.ts

@@ -1,64 +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 DELETING_PROPERTY_NAME: string = 'COA_ENDPOINT';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            'project.id': { $eq: project.id },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries }
-            // typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
-            // startDate: { $gte: new Date() }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: chevre.factory.event.IEvent<chevre.factory.eventType> = doc.toObject();
-
-        const coaEndpointPropert = event.additionalProperty?.find((p) => p.name === DELETING_PROPERTY_NAME);
-
-        if (coaEndpointPropert !== undefined) {
-            const newAdditionalProperty: chevre.factory.propertyValue.IPropertyValue<string>[] =
-                (Array.isArray(event.additionalProperty))
-                    ? event.additionalProperty.filter((p) => {
-                        return p.name !== DELETING_PROPERTY_NAME;
-                    })
-                    : [];
-            console.log(
-                'updating event...', event.project.id, event.id, event.startDate, coaEndpointPropert.value, newAdditionalProperty, i);
-            await eventRepo.updatePartiallyById({
-                id: event.id,
-                attributes: <any>{
-                    typeOf: event.typeOf,
-                    additionalProperty: newAdditionalProperty
-                }
-            });
-            updateCount += 1;
-            console.log('event updated', event.project.id, event.id, event.startDate, i);
-        } else {
-            console.log('no property...', event.project.id, event.id, event.startDate, i);
-        }
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migrateScreeningEventSeriesVersion.ts

@@ -1,79 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { typeOf: chevre.factory.organizationType.Project, id: String(process.env.PROJECT_ID) };
-
-const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            'project.id': {
-                // $eq: project.id,
-                $ne: EXCLUDED_PROJECT_ID
-            },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries },
-            'workPerformed.version': { $exists: false }
-            // _id: { $eq: 'bl7ed6sq9' }
-        },
-        {
-            _id: 1,
-            workPerformed: 1,
-            project: 1,
-            location: 1,
-            startDate: 1,
-            typeOf: 1
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: chevre.factory.event.screeningEventSeries.IEvent = doc.toObject();
-        const version = event.workPerformed.version;
-
-        const alreadyMigrated = typeof version === 'string' && version.length > 0;
-
-        if (alreadyMigrated) {
-            console.log('alreadyMigrated.', event.project.id, event.id, event.startDate, version, i);
-        } else {
-            // 既存施設コンテンツバージョンを検索
-            const { maxVersion } = await eventRepo.aggregateScreeningEventMaxVersion({
-                project: { id: { $eq: event.project.id } },
-                workPerformed: { identifier: { $eq: event.workPerformed.identifier } },
-                location: { branchCode: { $in: [event.location.branchCode] } }
-            });
-            console.log('maxVersion:', maxVersion);
-
-            const newVersion: string = `${Number(maxVersion) + 1}`;
-            console.log('updating event...', event.project.id, event.id, event.startDate, newVersion, i);
-            await eventRepo.updatePartiallyById({
-                id: event.id,
-                attributes: <any>{
-                    typeOf: event.typeOf,
-                    'workPerformed.version': newVersion
-                }
-            });
-            updateCount += 1;
-            console.log('updated.', event.project.id, event.id, event.startDate, newVersion, i);
-        }
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);