@chevre/domain 22.13.0-alpha.8 → 22.13.0

package/example/src/chevre/event/upsertManyScreeningEventByIdentifier.ts

@@ -18,12 +18,11 @@ async function main() {
         .format('YYYY-MM-DD');
     const identifier = `fromSamples:${moment()
         .format('YYYY-MM-DD HH:mm')}`;
-    const settingEvent: chevre.factory.event.screeningEvent.IEvent = {
+    const settingEvent: chevre.factory.event.screeningEvent.IAttributes = {
         identifier,
         additionalProperty: [
             { name: ADDITIONAL_PROPERTY_NAME, value: identifier }
         ],
-        id: 'bmcvkft5g',
         project: {
             id: project.id,
             typeOf: chevre.factory.organizationType.Project

package/example/src/chevre/migrateProjectSettings.ts

@@ -0,0 +1,64 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
+
+    const cursor = projectRepo.getCursor(
+        {
+            // _id: { $eq: 'cinerino' }
+        },
+        {
+            _id: 1,
+            settings: 1,
+            typeOf: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const project: Pick<chevre.factory.project.IProject, 'id' | 'typeOf' | 'settings'> = doc.toObject();
+
+        console.log(
+            'alreadyMigrated?', project.id, i);
+        const includeCustomerAsFindByConfirmationNumberResult = project.settings?.includeCustomerAsFindByConfirmationNumberResult;
+        let alreadyMigrated = false;
+        if (typeof includeCustomerAsFindByConfirmationNumberResult === 'boolean') {
+            alreadyMigrated = true;
+        }
+
+        if (alreadyMigrated) {
+            console.log(
+                'already migrated.', project.id, i);
+        } else {
+            console.log(
+                'updating project...',
+                project.id, i);
+            await projectRepo.updateById({
+                id: project.id,
+                settings: {
+                    includeCustomerAsFindByConfirmationNumberResult: true
+                }
+            });
+            updateCount += 1;
+            console.log(
+                'updated.',
+                project.id, i);
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(updateCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/orders/searchOrders.ts

@@ -0,0 +1,28 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
+
+    const orders = await orderRepo.projectFields(
+        {
+            limit: 1,
+            page: 1
+        },
+        { inclusion: ['customer.id', 'customer.typeOf'] }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(orders, { depth: null });
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/roles/addPermissionIfNotExists.ts

@@ -9,10 +9,10 @@ async function main() {
     const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
     const roleNames = [
-        chevre.factory.role.organizationRole.RoleName.InventoryManager
+        chevre.factory.role.organizationRole.RoleName.AdminInventoryManager
     ];
     const permissions = [
-        'sellerMakesOffer.*'
+        'admin.sellers.events.*'
     ];
     for (const roleName of roleNames) {
         for (const permission of permissions) {

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

@@ -111,7 +111,9 @@ export declare class EventRepo {
      * イベントコードをキーにして冪等置換
      */
     upsertManyScreeningEventByIdentifier(params: {
-        $set: factory.event.screeningEvent.IEvent;
+        $set: factory.event.screeningEvent.IAttributes & {
+            id?: never;
+        };
         $unset: IUnset<factory.eventType.ScreeningEvent>;
     }[], options: {
         /**

package/lib/chevre/repo/event.js

@@ -73,6 +73,10 @@ class EventRepo {
         if (Array.isArray(idIn)) {
             andConditions.push({ _id: { $in: idIn } });
         }
+        const identifierIn = conditions.identifiers;
+        if (Array.isArray(identifierIn)) {
+            andConditions.push({ identifier: { $exists: true, $in: identifierIn } });
+        }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (Array.isArray(conditions.eventStatuses)) {
@@ -130,16 +134,6 @@ class EventRepo {
         if (Array.isArray(locationBranchCodeIn)) {
             andConditions.push({ 'location.branchCode': { $exists: true, $in: locationBranchCodeIn } });
         }
-        // discontinue(2024-09-30)
-        // const hasOfferCatalogIdEq = conditions.hasOfferCatalog?.id?.$eq;
-        // if (typeof hasOfferCatalogIdEq === 'string') {
-        //     andConditions.push({
-        //         'hasOfferCatalog.id': {
-        //             $exists: true,
-        //             $eq: hasOfferCatalogIdEq
-        //         }
-        //     });
-        // }
         const additionalPropertyElemMatch = (_l = conditions.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({

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

@@ -1,7 +1,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IOrderWithoutAcceptedOffers = factory.order.IOrder;
-type IKeyOfProjection = Extract<keyof IOrderWithoutAcceptedOffers, 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'identifier' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'project' | 'returner' | 'seller' | 'typeOf' | 'url'> | 'paymentMethods.accountId' | 'paymentMethods.name' | 'paymentMethods.paymentMethod' | 'paymentMethods.paymentMethodId' | 'paymentMethods.totalPaymentDue' | 'paymentMethods.additionalProperty' | 'paymentMethods.issuedThrough';
+type IKeyOfProjection = Extract<keyof IOrderWithoutAcceptedOffers, 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'identifier' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'project' | 'returner' | 'seller' | 'typeOf' | 'url'> | 'paymentMethods.accountId' | 'paymentMethods.name' | 'paymentMethods.paymentMethod' | 'paymentMethods.paymentMethodId' | 'paymentMethods.totalPaymentDue' | 'paymentMethods.additionalProperty' | 'paymentMethods.issuedThrough' | 'customer.id' | 'customer.typeOf';
 export type IReturnedOrder = Pick<IOrderWithoutAcceptedOffers, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate'> & {
     id: string;
 };

package/lib/chevre/repo/order.js

@@ -21,7 +21,8 @@ const AVAILABLE_PROJECT_FIELDS = [
     'broker', 'confirmationNumber', 'customer', 'dateReturned', 'identifier', 'name', 'orderDate', 'orderNumber', 'orderStatus', 'orderedItem',
     'paymentMethods', 'previousOrderStatus', 'price', 'priceCurrency', 'project', 'returner', 'seller', 'typeOf', 'url',
     'paymentMethods.accountId', 'paymentMethods.additionalProperty', 'paymentMethods.issuedThrough', 'paymentMethods.name', 'paymentMethods.paymentMethod',
-    'paymentMethods.paymentMethodId', 'paymentMethods.totalPaymentDue'
+    'paymentMethods.paymentMethodId', 'paymentMethods.totalPaymentDue',
+    'customer.id', 'customer.typeOf'
 ];
 /**
  * 注文リポジトリ

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

@@ -27,7 +27,7 @@ export declare class ProjectRepo {
         logo?: string;
         hasMerchantReturnPolicy?: Pick<factory.project.IHasMerchantReturnPolicy, 'sameAs' | 'identifier'>;
         name?: string;
-        settings?: {
+        settings?: Pick<factory.project.ISettings, 'includeCustomerAsFindByConfirmationNumberResult'> & {
             sendEmailMessage?: factory.project.ISendEmailMessageSettings;
             sendgridApiKey?: string;
         };

package/lib/chevre/repo/project.js

@@ -134,23 +134,26 @@ class ProjectRepo {
     }
     updateById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g;
             let hasMerchantReturnPolicy;
             if (typeof ((_a = params.hasMerchantReturnPolicy) === null || _a === void 0 ? void 0 : _a.sameAs) === 'string') {
                 hasMerchantReturnPolicy = Object.assign({ sameAs: params.hasMerchantReturnPolicy.sameAs, typeOf: 'MerchantReturnPolicy' }, (typeof params.hasMerchantReturnPolicy.identifier === 'string')
                     ? { identifier: params.hasMerchantReturnPolicy.identifier } : undefined);
             }
-            yield this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
+            const includeCustomerAsFindByConfirmationNumberResult = (_b = params.settings) === null || _b === void 0 ? void 0 : _b.includeCustomerAsFindByConfirmationNumberResult;
+            yield this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
                 ? { alternateName: params.alternateName }
-                : undefined), (typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined), (typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined), (typeof ((_d = (_c = (_b = params.settings) === null || _b === void 0 ? void 0 : _b.sendEmailMessage) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email) === 'string')
+                : undefined), (typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined), (typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined), (typeof ((_e = (_d = (_c = params.settings) === null || _c === void 0 ? void 0 : _c.sendEmailMessage) === null || _d === void 0 ? void 0 : _d.sender) === null || _e === void 0 ? void 0 : _e.email) === 'string')
                 ? {
                     'settings.sendEmailMessage': {
                         sender: { email: params.settings.sendEmailMessage.sender.email }
                     }
                 }
-                : undefined), (typeof ((_e = params.settings) === null || _e === void 0 ? void 0 : _e.sendgridApiKey) === 'string')
+                : undefined), (typeof ((_f = params.settings) === null || _f === void 0 ? void 0 : _f.sendgridApiKey) === 'string')
                 ? { 'settings.sendgridApiKey': params.settings.sendgridApiKey }
-                : undefined), (typeof ((_f = params.subscription) === null || _f === void 0 ? void 0 : _f.useEventServiceAsProduct) === 'boolean')
+                : undefined), (typeof includeCustomerAsFindByConfirmationNumberResult === 'boolean')
+                ? { 'settings.includeCustomerAsFindByConfirmationNumberResult': includeCustomerAsFindByConfirmationNumberResult }
+                : undefined), (typeof ((_g = params.subscription) === null || _g === void 0 ? void 0 : _g.useEventServiceAsProduct) === 'boolean')
                 ? { 'subscription.useEventServiceAsProduct': params.subscription.useEventServiceAsProduct }
                 : undefined), (hasMerchantReturnPolicy !== undefined) ? { hasMerchantReturnPolicy } : undefined), { $unset: {
                     'settings.cognito': 1 // 廃止(2023-11-10~)

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.398.0-alpha.4",
+    "@chevre/factory": "4.398.0",
     "@cinerino/sdk": "12.2.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.13.0-alpha.8"
+  "version": "22.13.0"
 }

package/example/src/chevre/migrateProjectTokenIssuers.ts

@@ -1,100 +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 excludedProject = { id: String(process.env.EXCLUDED_PROJECT_ID) };
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const identityProviderRepo = await chevre.repository.IdentityProvider.createInstance(mongoose.connection);
-    const projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
-
-    const cursor = projectRepo.getCursor(
-        {
-            // _id: { $eq: 'cinerino' }
-        },
-        {
-            _id: 1,
-            settings: 1,
-            typeOf: 1
-        }
-    );
-    console.log('docs found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const project: Pick<chevre.factory.project.IProject, 'id' | 'typeOf' | 'settings'> = doc.toObject();
-
-        console.log(
-            'alreadyMigrated?', project.id, i);
-        const tokenIssuers: string[] | undefined = (<any>project.settings).tokenIssuers;
-        let alreadyMigrated = false;
-        if (Array.isArray(tokenIssuers)) {
-            let existingProvidersCount = 0;
-            for (const tokenIssuer of tokenIssuers) {
-                const existingProviders = await identityProviderRepo.projectFields(
-                    {
-                        limit: 1,
-                        page: 1,
-                        project: { id: { $eq: project.id } },
-                        identifier: { $eq: tokenIssuer }
-                    },
-                    ['identifier']
-                );
-                existingProvidersCount += existingProviders.length;
-            }
-            if (existingProvidersCount === tokenIssuers.length) {
-                alreadyMigrated = true;
-            }
-        } else {
-            alreadyMigrated = true;
-        }
-
-        if (alreadyMigrated) {
-            console.log(
-                'already migrated.', project.id, i);
-        } else {
-            if (Array.isArray(tokenIssuers)) {
-                const newProviders = tokenIssuers.map((tokenIssuer) => {
-                    return {
-                        identifier: tokenIssuer,
-                        project: {
-                            id: project.id,
-                            typeOf: <chevre.factory.organizationType.Project>chevre.factory.organizationType.Project
-                        },
-                        typeOf: <chevre.factory.organizationType.Organization>chevre.factory.organizationType.Organization,
-                        verified: true
-                    };
-                });
-                console.log(
-                    'updating project...',
-                    project.id, i, newProviders.length, 'newProviders');
-                for (const newProvider of newProviders) {
-                    console.log(
-                        'updating project...',
-                        project.id, i, newProvider);
-                    // await identityProviderRepo.save({
-                    //     attributes: newProvider
-                    // });
-                }
-                updateCount += 1;
-                console.log(
-                    'updated.',
-                    project.id, i);
-            }
-        }
-    });
-
-    console.log(i, 'docs checked');
-    console.log(updateCount, 'docs updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/searchOrderAcceptedOffers.ts

@@ -1,48 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-mongoose.Model.on('index', (...args) => {
-    console.error('******** index event emitted. ********\n', args);
-});
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const acceptedOfferRepo = await chevre.repository.AcceptedOffer.createInstance(mongoose.connection);
-
-    const acceptedOffers = await acceptedOfferRepo.searchAcceptedOffersByOrderNumber(
-        {
-            // tslint:disable-next-line:no-magic-numbers
-            limit: 10,
-            page: 1,
-            project: { id: { $eq: project.id } },
-            orderNumber: { $eq: 'CIN7-9247770-0699829' },
-            acceptedOffers: {
-                itemOffered: {
-                    typeOf: { $in: [chevre.factory.reservationType.EventReservation] },
-                    reservationFor: { id: { $in: ['blpw1ew8f'] } },
-                    reservedTicket: { ticketedSeat: { seatNumber: { $in: ['A-26', 'xxx'] } } }
-                }
-            }
-        },
-        ['itemOffered', 'priceSpecification']
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(acceptedOffers, { depth: 1 });
-    const reservationIds = acceptedOffers.map((acceptedOffer) => {
-        if (acceptedOffer.itemOffered.typeOf === chevre.factory.reservationType.EventReservation) {
-            return acceptedOffer.itemOffered.id;
-        } else {
-            return '';
-        }
-    });
-    console.log('reservationIds:', reservationIds);
-}
-
-main()
-    .then()
-    .catch(console.error);