@chevre/domain 22.9.0-alpha.30 → 22.9.0-alpha.31

package/example/src/chevre/checkPaymentServiceUniqueness.ts

@@ -0,0 +1,79 @@
+// 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 paymentServiceRepo = await chevre.repository.PaymentService.createInstance(mongoose.connection);
+
+    const cursor = paymentServiceRepo.getCursor(
+        {
+            typeOf: {
+                $in: [
+                    chevre.factory.service.paymentService.PaymentServiceType.CreditCard,
+                    chevre.factory.service.paymentService.PaymentServiceType.MovieTicket
+                ]
+            }
+            // _id: { $eq: '5f9a4fed4f3709000abe6415' }
+        },
+        {
+            _id: 1,
+            availableChannel: 1,
+            productID: 1,
+            project: 1,
+            typeOf: 1,
+            serviceType: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    // let updateCount = 0;
+    const unexpectedIds: string[] = [];
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const paymentService: Pick<
+            chevre.factory.service.paymentService.IService,
+            'availableChannel' | 'id' | 'productID' | 'project' | 'typeOf' | 'serviceType'
+        > = doc.toObject();
+
+        console.log(
+            'alreadyMigrated?', paymentService.project.id, paymentService.productID, i);
+        if (typeof paymentService.id !== 'string') {
+            throw new Error('id must be string');
+        }
+
+        let isUnique = false;
+        const existingServices = await paymentServiceRepo.projectFields(
+            {
+                project: { id: { $eq: paymentService.project.id } },
+                serviceType: { codeValue: { $eq: paymentService.serviceType.codeValue } }
+            },
+            ['id']
+        );
+        if (existingServices.length === 1 && existingServices.at(0)?.id === paymentService.id) {
+            isUnique = true;
+        }
+
+        if (isUnique) {
+            console.log(
+                'unique.', paymentService.project.id, paymentService.productID, i);
+        } else {
+            unexpectedIds.push(paymentService.productID);
+        }
+    });
+
+    console.log(unexpectedIds);
+    console.log(i, 'docs checked');
+    console.log(unexpectedIds.length, 'docs unexpected');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/mongoose/schemas/paymentService.js

@@ -135,6 +135,22 @@ const indexes = [
                 'availableChannel.serviceUrl': { $exists: true }
             }
         }
+    ],
+    [
+        { 'availableChannel.id': 1, productID: 1 },
+        {
+            name: 'availableChannelId',
+            partialFilterExpression: {
+                'availableChannel.id': { $exists: true }
+            }
+        }
+    ],
+    [
+        { 'project.id': 1, 'serviceType.codeValue': 1 },
+        {
+            name: 'uniqueServiceTypeCodeValue',
+            unique: true
+        }
     ]
 ];
 exports.indexes = indexes;

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

@@ -53,7 +53,8 @@ export declare class PaymentServiceRepo {
          * payment service ID
          */
         id: string;
-    }): Promise<Pick<factory.service.paymentService.IAvailableChannel, 'serviceUrl' | 'totalPaymentDue' | 'typeOf' | 'id'> & {
+    }): Promise<Pick<factory.service.paymentService.IAvailableChannel, 'totalPaymentDue' | 'typeOf' | 'id'> & Pick<factory.serviceChannel.IServiceChannel, 'serviceUrl'> & {
+        id: string;
         credentials: factory.serviceChannel.ICredentialsCreditCard;
     }>;
     findAvailableChannelMovieTicket(params: {
@@ -64,7 +65,8 @@ export declare class PaymentServiceRepo {
          * payment service ID
          */
         id: string;
-    }): Promise<Pick<factory.service.paymentService.IAvailableChannel, 'serviceUrl' | 'totalPaymentDue' | 'typeOf' | 'id'> & {
+    }): Promise<Pick<factory.service.paymentService.IAvailableChannel, 'totalPaymentDue' | 'typeOf' | 'id'> & Pick<factory.serviceChannel.IServiceChannel, 'serviceUrl'> & {
+        id: string;
         credentials: factory.serviceChannel.ICredentialsMovieTicket;
     }>;
     saveChannelByServiceUrl(params: Omit<factory.serviceChannel.IServiceChannel, 'id'>): Promise<void>;

package/lib/chevre/repo/paymentService.js

@@ -47,7 +47,7 @@ class PaymentServiceRepo {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
@@ -164,7 +164,11 @@ class PaymentServiceRepo {
         if (typeof providerIdEq === 'string') {
             andConditions.push({ 'provider.id': { $exists: true, $eq: providerIdEq } });
         }
-        const availableChannelServiceUrlEq = (_1 = (_0 = params.availableChannel) === null || _0 === void 0 ? void 0 : _0.serviceUrl) === null || _1 === void 0 ? void 0 : _1.$eq;
+        const availableChannelIdEq = (_1 = (_0 = params.availableChannel) === null || _0 === void 0 ? void 0 : _0.id) === null || _1 === void 0 ? void 0 : _1.$eq;
+        if (typeof availableChannelIdEq === 'string') {
+            andConditions.push({ 'availableChannel.id': { $exists: true, $eq: availableChannelIdEq } });
+        }
+        const availableChannelServiceUrlEq = (_3 = (_2 = params.availableChannel) === null || _2 === void 0 ? void 0 : _2.serviceUrl) === null || _3 === void 0 ? void 0 : _3.$eq;
         if (typeof availableChannelServiceUrlEq === 'string') {
             andConditions.push({ 'availableChannel.serviceUrl': { $exists: true, $eq: availableChannelServiceUrlEq } });
         }

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.393.0-alpha.27",
-    "@cinerino/sdk": "10.21.0-alpha.17",
+    "@chevre/factory": "4.393.0-alpha.28",
+    "@cinerino/sdk": "10.21.0-alpha.18",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.30"
+  "version": "22.9.0-alpha.31"
 }