@chevre/domain 23.0.0-alpha.27 → 23.0.0-alpha.28

package/example/src/chevre/categoryCode/checkUniqueness.ts

@@ -0,0 +1,69 @@
+// tslint:disable:no-console no-magic-numbers
+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 categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
+
+    const cursor = categoryCodeRepo.getCursor(
+        {
+            // _id: { $eq: '68f5d32176b5f6b689ff24a6' },
+            // 'project.id': { $eq: project.id },
+            // 'additionalProperty.name': { $exists: true, $eq: PROPERTY_NAME }
+            'inCodeSet.identifier': { $ne: chevre.factory.movieTicketType.CategorySetIdentifier.MovieTicketType }
+        },
+        {
+            _id: 1,
+            codeValue: 1,
+            project: 1,
+            inCodeSet: 1,
+            name: 1,
+            typeOf: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let notUniqueCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const categoryCode: Pick<
+            chevre.factory.categoryCode.ICategoryCode,
+            'codeValue' | 'id' | 'inCodeSet' | 'name' | 'project' | 'typeOf'
+        > = doc.toObject();
+
+        // console.log('unique?', categoryCode.project.id, categoryCode.id, categoryCode.codeValue, i);
+
+        const sameCodeValues = (await categoryCodeRepo.projectCategoryCodeFields(
+            {
+                project: { id: { $eq: categoryCode.project.id } },
+                codeValue: { $eq: categoryCode.codeValue }
+                // inCodeSet:{identifier:{$}}
+            },
+            ['codeValue', 'inCodeSet']
+        )).filter(
+            ({ inCodeSet }) => <unknown>inCodeSet.identifier !== chevre.factory.movieTicketType.CategorySetIdentifier.MovieTicketType
+        );
+        // console.log(sameCodeValues, 'sameCodeValues found', categoryCode.project.id, categoryCode.id, categoryCode.codeValue, i);
+
+        const isUnique = sameCodeValues.length === 1;
+        if (isUnique) {
+            // console.log(
+            //     'unique.', categoryCode.project.id, categoryCode.id, categoryCode.codeValue, i);
+        } else {
+            notUniqueCount += 1;
+            console.log('not unique.', categoryCode.project.id, categoryCode.id, categoryCode.codeValue, i);
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(notUniqueCount, 'docs not unique');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/movieTicketType/deleteOldMovieTicketTypes.ts

@@ -0,0 +1,15 @@
+// tslint:disable:no-console no-magic-numbers
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const movieTicketTypeRepo = await chevre.repository.MovieTicketType.createInstance(mongoose.connection);
+    await movieTicketTypeRepo.deleteOldMovieTicketTypes(mongoose.connection);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/reIndex.ts

@@ -11,7 +11,8 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    await chevre.repository.Note.createInstance(mongoose.connection);
+    await chevre.repository.CategoryCode.createInstance(mongoose.connection);
+    // await chevre.repository.MovieTicketType.createInstance(mongoose.connection);
     console.log('success!');
 }
 

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

@@ -4,7 +4,6 @@ exports.modelName = exports.indexes = void 0;
 exports.createSchema = createSchema;
 const mongoose_1 = require("mongoose");
 const writeConcern_1 = require("../writeConcern");
-const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const modelName = 'CategoryCode';
 exports.modelName = modelName;
@@ -100,37 +99,49 @@ const indexes = [
             }
         }
     ],
-    // add unique index(2024-11-14~)
-    [
-        {
-            'project.id': 1,
-            'inCodeSet.identifier': 1,
-            codeValue: 1
-        },
-        {
-            unique: true,
-            name: 'uniqueByCodeValueAndInCodeSet',
-            partialFilterExpression: {
-                // tslint:disable-next-line:no-null-keyword
-                'paymentMethod.typeOf': null
-            }
-        }
-    ],
+    // 決済カード区分をコレクション分離したので、reIndex unique index(2025-11-05~)
     [
         {
             'project.id': 1,
-            'paymentMethod.typeOf': 1,
+            'inCodeSet.identifier': 1, // ssktsでのみ区分分類をまたいで重複がある
             codeValue: 1
         },
         {
             unique: true,
-            name: 'uniqueByCodeValueAndPaymentMethod',
-            partialFilterExpression: {
-                'inCodeSet.identifier': { $eq: factory.movieTicketType.CategorySetIdentifier.MovieTicketType },
-                'paymentMethod.typeOf': { $exists: true }
-            }
+            name: 'uniqueByCodeValue'
         }
     ]
+    // add unique index(2024-11-14~)
+    // [
+    //     {
+    //         'project.id': 1,
+    //         'inCodeSet.identifier': 1,
+    //         codeValue: 1
+    //     },
+    //     {
+    //         unique: true,
+    //         name: 'uniqueByCodeValueAndInCodeSet',
+    //         partialFilterExpression: {
+    //             // tslint:disable-next-line:no-null-keyword
+    //             'paymentMethod.typeOf': null
+    //         }
+    //     }
+    // ],
+    // [
+    //     {
+    //         'project.id': 1,
+    //         'paymentMethod.typeOf': 1,
+    //         codeValue: 1
+    //     },
+    //     {
+    //         unique: true,
+    //         name: 'uniqueByCodeValueAndPaymentMethod',
+    //         partialFilterExpression: {
+    //             'inCodeSet.identifier': { $eq: factory.movieTicketType.CategorySetIdentifier.MovieTicketType },
+    //             'paymentMethod.typeOf': { $exists: true }
+    //         }
+    //     }
+    // ]
 ];
 exports.indexes = indexes;
 /**

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

@@ -54,5 +54,6 @@ export declare class MovieTicketTypeRepo {
         };
     }): Promise<void>;
     migrateCollections(connection: Connection): Promise<void>;
+    deleteOldMovieTicketTypes(connection: Connection): Promise<void>;
 }
 export {};

package/lib/chevre/repo/movieTicketType.js

@@ -275,7 +275,7 @@ class MovieTicketTypeRepo {
                 const movieTicketType = doc.toObject();
                 const { additionalProperty } = movieTicketType, docWithoutAdditinalProperty = __rest(movieTicketType, ["additionalProperty"]);
                 // tslint:disable-next-line:no-console
-                console.log('upserting...', doc);
+                console.log('upserting...', docWithoutAdditinalProperty, i);
                 const result = yield movieTicketTypeModel.findOneAndReplace({ _id: { $eq: doc._id } }, docWithoutAdditinalProperty, {
                     upsert: true,
                     projection: { _id: 1 }
@@ -283,11 +283,23 @@ class MovieTicketTypeRepo {
                     .exec();
                 // await additionalPropertyRepo.save({ attributes: additionalProperty });
                 // tslint:disable-next-line:no-console
-                console.log('upserted', result, movieTicketType.id, movieTicketType.project.id, movieTicketType.codeValue);
+                console.log('upserted', result, movieTicketType.id, movieTicketType.project.id, movieTicketType.codeValue, i);
             }));
             // tslint:disable-next-line:no-console
             console.log(i, 'docs checked');
         });
     }
+    // tslint:disable-next-line:prefer-function-over-method
+    deleteOldMovieTicketTypes(connection) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const oldCategoryCodeModel = connection.model(categoryCode_1.modelName, (0, categoryCode_1.createSchema)());
+            const result = yield oldCategoryCodeModel.deleteMany({
+                'inCodeSet.identifier': { $eq: factory.movieTicketType.CategorySetIdentifier.MovieTicketType }
+            })
+                .exec();
+            // tslint:disable-next-line:no-console
+            console.log(result);
+        });
+    }
 }
 exports.MovieTicketTypeRepo = MovieTicketTypeRepo;

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": "5.2.0-alpha.3",
-    "@cinerino/sdk": "12.7.0-alpha.0",
+    "@chevre/factory": "5.2.0-alpha.4",
+    "@cinerino/sdk": "12.7.0-alpha.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.0.0-alpha.27"
+  "version": "23.0.0-alpha.28"
 }