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

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

@@ -4,7 +4,7 @@ import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../../lib/index';
 
-const project = { id: String(process.env.PROJECT_ID) };
+// const project = { id: String(process.env.PROJECT_ID) };
 const PROPERTY_NAME = 'createId';
 
 async function additionalProperty2identifier(raw: string) {
@@ -42,7 +42,7 @@ async function main() {
     const cursor = eventRepo.getCursor(
         {
             // _id: { $eq: '68f5d32176b5f6b689ff24a6' },
-            'project.id': { $eq: project.id },
+            // 'project.id': { $eq: project.id },
             'additionalProperty.name': { $exists: true, $eq: PROPERTY_NAME }
         },
         {
@@ -80,6 +80,10 @@ async function main() {
 
         if (alreadyMigrated) {
             validateIdentifier(eventIdentifier);
+            // 追加特性から生成された識別子に一致するはず
+            if (identifierMustBe !== eventIdentifier) {
+                throw new Error(`${identifierMustBe} !== ${eventIdentifier} ${event.id}, ${i}`);
+            }
             console.log(
                 'already migrated.', event.project.id, eventIdentifier, additionalPropertyValue, event.id, event.startDate, i);
         } else {

package/example/src/chevre/movieTicketType/migrateCollections.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.migrateCollections(mongoose.connection);
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -3,13 +3,8 @@ import * as factory from '../factory';
 type IUnset = {
     [key in keyof Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'color' | 'image' | 'paymentMethod'>]?: 1;
 };
-export type CategorySetIdentifierExceptMovieTicketType = Exclude<factory.categoryCode.CategorySetIdentifier, factory.categoryCode.CategorySetIdentifier.MovieTicketType>;
-export type ICategoryCodeExceptMovieTicketType = Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'codeValue' | 'color' | 'id' | 'image' | 'name' | 'project' | 'typeOf'> & {
-    inCodeSet: {
-        typeOf: 'CategoryCodeSet';
-        identifier: CategorySetIdentifierExceptMovieTicketType;
-    };
-};
+export type CategorySetIdentifierExceptMovieTicketType = factory.categoryCode.CategorySetIdentifier;
+export type ICategoryCodeExceptMovieTicketType = Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'codeValue' | 'color' | 'id' | 'image' | 'name' | 'project' | 'typeOf' | 'inCodeSet'>;
 type IKeyOfProjection = keyof factory.categoryCode.ICategoryCode;
 type IKeyOfProjectionExceptMovieTicketType = keyof ICategoryCodeExceptMovieTicketType;
 /**

package/lib/chevre/repo/categoryCode.js

@@ -37,7 +37,7 @@ class CategoryCodeRepo {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params, options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g;
         const excludeMovieTicketType = (options === null || options === void 0 ? void 0 : options.excludeMovieTicketType) === true;
         const andConditions = [];
         if (excludeMovieTicketType) {
@@ -133,25 +133,25 @@ class CategoryCodeRepo {
                 }
             });
         }
-        const paymentMethodTypeOfEq = (_h = (_g = params.paymentMethod) === null || _g === void 0 ? void 0 : _g.typeOf) === null || _h === void 0 ? void 0 : _h.$eq;
-        if (typeof paymentMethodTypeOfEq === 'string') {
-            andConditions.push({
-                'paymentMethod.typeOf': {
-                    $exists: true,
-                    $eq: paymentMethodTypeOfEq
-                }
-            });
-        }
-        const paymentMethodTypeOfIn = (_k = (_j = params.paymentMethod) === null || _j === void 0 ? void 0 : _j.typeOf) === null || _k === void 0 ? void 0 : _k.$in;
-        if (Array.isArray(paymentMethodTypeOfIn)) {
-            andConditions.push({
-                'paymentMethod.typeOf': {
-                    $exists: true,
-                    $in: paymentMethodTypeOfIn
-                }
-            });
-        }
-        const additionalPropertyElemMatch = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
+        // const paymentMethodTypeOfEq = params.paymentMethod?.typeOf?.$eq;
+        // if (typeof paymentMethodTypeOfEq === 'string') {
+        //     andConditions.push({
+        //         'paymentMethod.typeOf': {
+        //             $exists: true,
+        //             $eq: paymentMethodTypeOfEq
+        //         }
+        //     });
+        // }
+        // const paymentMethodTypeOfIn = params.paymentMethod?.typeOf?.$in;
+        // if (Array.isArray(paymentMethodTypeOfIn)) {
+        //     andConditions.push({
+        //         'paymentMethod.typeOf': {
+        //             $exists: true,
+        //             $in: paymentMethodTypeOfIn
+        //         }
+        //     });
+        // }
+        const additionalPropertyElemMatch = (_g = params.additionalProperty) === null || _g === void 0 ? void 0 : _g.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {

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

@@ -126,7 +126,7 @@ const indexes = [
             unique: true,
             name: 'uniqueByCodeValueAndPaymentMethod',
             partialFilterExpression: {
-                'inCodeSet.identifier': { $eq: factory.categoryCode.CategorySetIdentifier.MovieTicketType },
+                'inCodeSet.identifier': { $eq: factory.movieTicketType.CategorySetIdentifier.MovieTicketType },
                 'paymentMethod.typeOf': { $exists: true }
             }
         }

package/lib/chevre/repo/mongoose/schemas/movieTicketTypes.d.ts

@@ -0,0 +1,11 @@
+import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import * as factory from '../../../factory';
+type IMovieTicketType = Pick<factory.movieTicketType.IMovieTicketType, 'codeValue' | 'color' | 'id' | 'image' | 'name' | 'project' | 'typeOf' | 'inCodeSet' | 'paymentMethod'>;
+type IDocType = factory.categoryCode.ICategoryCode;
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+declare const modelName = "MovieTicketType";
+declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
+export { createSchema, IModel, IMovieTicketType, indexes, modelName };

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

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modelName = exports.indexes = void 0;
+exports.createSchema = createSchema;
+const mongoose_1 = require("mongoose");
+const writeConcern_1 = require("../writeConcern");
+const settings_1 = require("../../../settings");
+const modelName = 'MovieTicketType';
+exports.modelName = modelName;
+const schemaDefinition = {
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    typeOf: { type: String, required: true },
+    // additionalProperty: [SchemaTypes.Mixed],
+    color: String,
+    image: String,
+    codeValue: { type: String, required: true },
+    inCodeSet: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    name: mongoose_1.SchemaTypes.Mixed,
+    paymentMethod: { type: mongoose_1.SchemaTypes.Mixed, required: true }
+};
+const schemaOptions = {
+    autoIndex: settings_1.MONGO_AUTO_INDEX,
+    autoCreate: false,
+    collection: 'movieTicketTypes',
+    id: true,
+    read: settings_1.MONGO_READ_PREFERENCE,
+    writeConcern: writeConcern_1.writeConcern,
+    strict: true,
+    strictQuery: false,
+    timestamps: false, // 2024-08-22~
+    versionKey: false, // 2024-08-22~
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+};
+const indexes = [
+    [
+        { codeValue: 1 },
+        { name: 'codeValue' }
+    ],
+    [
+        { 'project.id': 1, codeValue: 1 },
+        { name: 'projectId' }
+    ],
+    [
+        { 'paymentMethod.typeOf': 1, codeValue: 1 },
+        { name: 'paymentMethodTypeOf' }
+    ],
+    [
+        { 'inCodeSet.identifier': 1, codeValue: 1 },
+        { name: 'inCodeSetIdentifier' }
+    ],
+    [
+        {
+            'project.id': 1,
+            'paymentMethod.typeOf': 1,
+            codeValue: 1
+        },
+        {
+            unique: true,
+            name: 'uniqueByCodeValueAndPaymentMethod'
+        }
+    ],
+    [
+        { 'name.ja': 1, codeValue: 1 },
+        {
+            name: 'nameJa',
+            partialFilterExpression: {
+                'name.ja': { $exists: true }
+            }
+        }
+    ],
+    [
+        { 'name.en': 1, codeValue: 1 },
+        {
+            name: 'nameEn',
+            partialFilterExpression: {
+                'name.en': { $exists: true }
+            }
+        }
+    ]
+];
+exports.indexes = indexes;
+/**
+ * 決済カード区分スキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}

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

@@ -1,19 +1,8 @@
 import { AnyExpression, Connection, FilterQuery } from 'mongoose';
+import { IMovieTicketType } from './mongoose/schemas/movieTicketTypes';
 import * as factory from '../factory';
 type IUnset = {
-    [key in keyof Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'color' | 'image'>]?: 1;
-};
-type IMovieTicketType = Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'codeValue' | 'color' | 'id' | 'image' | 'name' | 'project' | 'typeOf'> & {
-    paymentMethod: {
-        /**
-         * 決済カード区分の場合、対応決済方法区分
-         */
-        typeOf: string;
-    };
-    inCodeSet: {
-        typeOf: 'CategoryCodeSet';
-        identifier: factory.categoryCode.CategorySetIdentifier.MovieTicketType;
-    };
+    [key in keyof Pick<factory.movieTicketType.IMovieTicketType, 'color' | 'image'>]?: 1;
 };
 type IKeyOfProjection = keyof IMovieTicketType;
 /**
@@ -22,17 +11,17 @@ type IKeyOfProjection = keyof IMovieTicketType;
 export declare class MovieTicketTypeRepo {
     private readonly categoryCodeModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): FilterQuery<IMovieTicketType>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.movieTicketType.ISearchConditions): FilterQuery<IMovieTicketType>[];
     static CREATE_AGGREGATE_PROJECTION(inclusion: IKeyOfProjection[]): {
         [field: string]: AnyExpression;
     };
     /**
      * 決済カード区分検索
      */
-    projectMovieTicketTypeFields(params: Omit<factory.categoryCode.ISearchConditions, 'inCodeSet'> & {
+    projectMovieTicketTypeFields(params: Omit<factory.movieTicketType.ISearchConditions, 'inCodeSet'> & {
         inCodeSet?: {
             identifier?: {
-                $eq?: factory.categoryCode.CategorySetIdentifier.MovieTicketType;
+                $eq?: factory.movieTicketType.CategorySetIdentifier.MovieTicketType;
             };
         };
     }, 
@@ -64,5 +53,6 @@ export declare class MovieTicketTypeRepo {
             id: string;
         };
     }): Promise<void>;
+    migrateCollections(connection: Connection): Promise<void>;
 }
 export {};

package/lib/chevre/repo/movieTicketType.js

@@ -24,25 +24,26 @@ exports.MovieTicketTypeRepo = void 0;
 // tslint:disable-next-line:no-implicit-dependencies
 const mongoose_1 = require("mongoose");
 const categoryCode_1 = require("./mongoose/schemas/categoryCode");
+const movieTicketTypes_1 = require("./mongoose/schemas/movieTicketTypes");
 const factory = require("../factory");
 const settings_1 = require("../settings");
 const AVAILABLE_PROJECT_FIELDS = [
-    'additionalProperty', 'codeValue', 'color', 'image', 'inCodeSet', 'name', 'paymentMethod', 'project', 'typeOf'
+    'codeValue', 'color', 'image', 'inCodeSet', 'name', 'paymentMethod', 'project', 'typeOf'
 ];
 /**
  * 決済カード区分リポジトリ
  */
 class MovieTicketTypeRepo {
     constructor(connection) {
-        this.categoryCodeModel = connection.model(categoryCode_1.modelName, (0, categoryCode_1.createSchema)());
+        this.categoryCodeModel = connection.model(movieTicketTypes_1.modelName, (0, movieTicketTypes_1.createSchema)());
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const andConditions = [
             {
                 'inCodeSet.identifier': {
-                    $eq: factory.categoryCode.CategorySetIdentifier.MovieTicketType
+                    $eq: factory.movieTicketType.CategorySetIdentifier.MovieTicketType
                 }
             }
         ];
@@ -138,15 +139,15 @@ class MovieTicketTypeRepo {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
-        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
-            andConditions.push({
-                additionalProperty: {
-                    $exists: true,
-                    $elemMatch: additionalPropertyElemMatch
-                }
-            });
-        }
+        // const additionalPropertyElemMatch = params.additionalProperty?.$elemMatch;
+        // if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+        //     andConditions.push({
+        //         additionalProperty: {
+        //             $exists: true,
+        //             $elemMatch: additionalPropertyElemMatch
+        //         }
+        //     });
+        // }
         return andConditions;
     }
     static CREATE_AGGREGATE_PROJECTION(inclusion) {
@@ -155,7 +156,7 @@ class MovieTicketTypeRepo {
             id: { $toString: '$_id' },
             project: '$project',
             typeOf: '$typeOf',
-            additionalProperty: '$additionalProperty',
+            // additionalProperty: '$additionalProperty',
             color: '$color',
             image: '$image',
             codeValue: '$codeValue',
@@ -258,5 +259,35 @@ class MovieTicketTypeRepo {
                 .exec();
         });
     }
+    // tslint:disable-next-line:prefer-function-over-method
+    migrateCollections(connection) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const oldCategoryCodeModel = connection.model(categoryCode_1.modelName, (0, categoryCode_1.createSchema)());
+            const movieTicketTypeModel = connection.model(movieTicketTypes_1.modelName, (0, movieTicketTypes_1.createSchema)());
+            const cursor = oldCategoryCodeModel.find({
+                'inCodeSet.identifier': { $eq: factory.movieTicketType.CategorySetIdentifier.MovieTicketType }
+            })
+                .sort({ codeValue: factory.sortType.Ascending })
+                .cursor();
+            let i = 0;
+            yield cursor.eachAsync((doc) => __awaiter(this, void 0, void 0, function* () {
+                i += 1;
+                const movieTicketType = doc.toObject();
+                const { additionalProperty } = movieTicketType, docWithoutAdditinalProperty = __rest(movieTicketType, ["additionalProperty"]);
+                // tslint:disable-next-line:no-console
+                console.log('upserting...', doc);
+                const result = yield movieTicketTypeModel.findOneAndReplace({ _id: { $eq: doc._id } }, docWithoutAdditinalProperty, {
+                    upsert: true,
+                    projection: { _id: 1 }
+                })
+                    .exec();
+                // await additionalPropertyRepo.save({ attributes: additionalProperty });
+                // tslint:disable-next-line:no-console
+                console.log('upserted', result, movieTicketType.id, movieTicketType.project.id, movieTicketType.codeValue);
+            }));
+            // tslint:disable-next-line:no-console
+            console.log(i, 'docs checked');
+        });
+    }
 }
 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.2",
-    "@cinerino/sdk": "12.6.0-alpha.5",
+    "@chevre/factory": "5.2.0-alpha.3",
+    "@cinerino/sdk": "12.7.0-alpha.0",
     "@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.25"
+  "version": "23.0.0-alpha.27"
 }