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

package/example/src/chevre/migrateCreativeWorkAdditionalProperties.ts

@@ -11,15 +11,27 @@ const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
+    // const customerRepo = new chevre.repository.Customer(mongoose.connection);
+    // const sellerRepo = new chevre.repository.Seller(mongoose.connection);
+    // const eventRepo = new chevre.repository.Event(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 = customerRepo.getCursor(
+    // const cursor = sellerRepo.getCursor(
+    // const cursor = eventRepo.getCursor(
+    // const cursor = categoryCodeRepo.getCursor(
+    // const cursor = offerRepo.getCursor(
     const cursor = creativeWorkRepo.getCursor(
         // const cursor = placeRepo.getCursor(
         {
             // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID }
+            'project.id': { $ne: EXCLUDED_PROJECT_ID },
+            // typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries },
+            // starDate: { $gte: new Date() }
             // _id: { $eq: 'al6aff83w' }
         },
         {
@@ -39,7 +51,12 @@ async function main() {
 
         const additionalPropertyNamesOnEvent = creativeWork.additionalProperty?.map((p) => p.name);
         if (Array.isArray(additionalPropertyNamesOnEvent) && additionalPropertyNamesOnEvent.length > 0) {
-            console.log(additionalPropertyNamesOnEvent.length, 'additionalPropertyNamesOnEvent found', creativeWork.project.id);
+            console.log(
+                additionalPropertyNamesOnEvent.length,
+                'additionalPropertyNamesOnEvent found',
+                creativeWork.project.id,
+                creativeWork.id
+            );
             additionalPropertyNames.push(...additionalPropertyNamesOnEvent);
             projectIds.push(creativeWork.project.id);
             additionalPropertyNamesOnEvent.forEach((name) => {

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/customer.d.ts

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

package/lib/chevre/repo/customer.js

@@ -130,5 +130,10 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.customerModel.find(conditions, projection)
+            .sort({ branchCode: 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/lib/chevre/repository.d.ts

@@ -2,7 +2,6 @@
  * リポジトリ
  */
 import { MongoRepository as AccountRepo } from './repo/account';
-import { MongoRepository as AccountActionRepo } from './repo/accountAction';
 import { MongoRepository as AccountingReportRepo } from './repo/accountingReport';
 import { MongoRepository as AccountTitleRepo } from './repo/accountTitle';
 import { MongoRepository as AccountTransactionRepo } from './repo/accountTransaction';
@@ -50,8 +49,6 @@ export declare class Account extends AccountRepo {
 /**
  * 口座アクションリポジトリ
  */
-export declare class AccountAction extends AccountActionRepo {
-}
 /**
  * 経理レポートリポジトリ
  */

package/lib/chevre/repository.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.itemAvailability = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.AccountAction = exports.Account = void 0;
+exports.rateLimit = exports.itemAvailability = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
 // tslint:disable:max-classes-per-file completed-docs
 /**
  * リポジトリ
  */
 const account_1 = require("./repo/account");
-const accountAction_1 = require("./repo/accountAction");
+// import { MongoRepository as AccountActionRepo } from './repo/accountAction';
 const accountingReport_1 = require("./repo/accountingReport");
 const accountTitle_1 = require("./repo/accountTitle");
 const accountTransaction_1 = require("./repo/accountTransaction");
@@ -55,9 +55,7 @@ exports.Account = Account;
 /**
  * 口座アクションリポジトリ
  */
-class AccountAction extends accountAction_1.MongoRepository {
-}
-exports.AccountAction = AccountAction;
+// export class AccountAction extends AccountActionRepo { }
 /**
  * 経理レポートリポジトリ
  */

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.26"
 }