@chevre/domain 20.1.0-alpha.24 → 20.1.0-alpha.25

package/example/src/chevre/migrateCreativeWorkAdditionalProperties.ts

@@ -11,11 +11,15 @@ const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
-    const creativeWorkRepo = new chevre.repository.CreativeWork(mongoose.connection);
+    // const creativeWorkRepo = new chevre.repository.CreativeWork(mongoose.connection);
     // const placeRepo = new chevre.repository.Place(mongoose.connection);
+    // const offerRepo = new chevre.repository.Offer(mongoose.connection);
+    const categoryCodeRepo = new chevre.repository.CategoryCode(mongoose.connection);
     // const additionalPropertyRepo = new chevre.repository.AdditionalProperty(mongoose.connection);
 
-    const cursor = creativeWorkRepo.getCursor(
+    const cursor = categoryCodeRepo.getCursor(
+        // const cursor = offerRepo.getCursor(
+        // const cursor = creativeWorkRepo.getCursor(
         // const cursor = placeRepo.getCursor(
         {
             // 'project.id': { $eq: project.id },

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

@@ -33,4 +33,5 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
+    getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
 }

package/lib/chevre/repo/categoryCode.js

@@ -32,7 +32,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         // MongoDB検索条件
         const andConditions = [];
         // tslint:disable-next-line:no-single-line-block-comment
@@ -140,6 +140,15 @@ class MongoRepository {
                 }
             });
         }
+        const additionalPropertyElemMatch = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            andConditions.push({
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: additionalPropertyElemMatch
+                }
+            });
+        }
         return andConditions;
     }
     count(params) {
@@ -228,5 +237,10 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.categoryCodeModel.find(conditions, projection)
+            .sort({ codeValue: factory.sortType.Ascending })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -13,7 +13,8 @@ const schema = new mongoose.Schema({
     typeOf: {
         type: String,
         required: true
-    }
+    },
+    additionalProperty: [mongoose.SchemaTypes.Mixed]
 }, {
     collection: 'categoryCodes',
     id: true,
@@ -71,6 +72,12 @@ schema.index({ 'paymentMethod.typeOf': 1, codeValue: 1 }, {
 schema.index({ 'project.id': 1, codeValue: 1 }, {
     name: 'searchByProjectId-v20220721'
 });
+schema.index({ additionalProperty: 1, codeValue: 1 }, {
+    name: 'searchByAdditionalProperty',
+    partialFilterExpression: {
+        additionalProperty: { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/repo/mongoose/model/offer.js

@@ -19,7 +19,7 @@ const schema = new mongoose.Schema({
     description: mongoose.SchemaTypes.Mixed,
     category: mongoose.SchemaTypes.Mixed,
     color: mongoose.SchemaTypes.Mixed,
-    additionalProperty: mongoose.SchemaTypes.Mixed,
+    additionalProperty: [mongoose.SchemaTypes.Mixed],
     alternateName: mongoose.SchemaTypes.Mixed,
     acceptedPaymentMethod: mongoose.SchemaTypes.Mixed,
     addOn: mongoose.SchemaTypes.Mixed,
@@ -189,6 +189,12 @@ schema.index({ 'hasMerchantReturnPolicy.id': 1, 'priceSpecification.price': 1 },
         'hasMerchantReturnPolicy.id': { $exists: true }
     }
 });
+schema.index({ additionalProperty: 1, 'priceSpecification.price': 1 }, {
+    name: 'searchByAdditionalProperty',
+    partialFilterExpression: {
+        additionalProperty: { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/repo/offer.js

@@ -35,7 +35,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_OFFER_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, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23;
+        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, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -285,6 +285,15 @@ class MongoRepository {
                 }
             });
         }
+        const additionalPropertyElemMatch = (_24 = params.additionalProperty) === null || _24 === void 0 ? void 0 : _24.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            andConditions.push({
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: additionalPropertyElemMatch
+                }
+            });
+        }
         return andConditions;
     }
     /**

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.279.0-alpha.3",
+    "@chevre/factory": "4.279.0-alpha.4",
     "@cinerino/sdk": "3.134.0-alpha.3",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.1.0-alpha.24"
+  "version": "20.1.0-alpha.25"
 }