@chevre/domain 23.0.0-alpha.10 → 23.0.0-alpha.12

package/example/src/chevre/offerCatalog/updateManyOfferCatalogsByIds.ts

@@ -0,0 +1,49 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+// const PROJECT_ID = process.env.PROJECT_ID;
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const offerCatalogRepo = await chevre.repository.OfferCatalog.createInstance(mongoose.connection);
+
+    try {
+        await offerCatalogRepo.updateManyOfferCatalogsByIds({
+            id: {
+                $in: ['xxx']
+            },
+            itemOffered: {
+                typeOf: {
+                    $eq: chevre.factory.product.ProductType.EventService
+                }
+            },
+            $push: {
+                itemListElement: {
+                    $each: [{ id: 'xxx', typeOf: chevre.factory.offerType.Offer }],
+                    $slice: 300
+                }
+            },
+            $pull: {
+                itemListElement: {
+                    $elemMatch: {
+                        id: {
+                            $in: ['xxx']
+                        }
+                    }
+                }
+            }
+        });
+    } catch (error) {
+        throw await chevre.errorHandler.handleMongoError(error);
+    }
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/product/findHasOfferCatalog.ts

@@ -10,16 +10,20 @@ async function main() {
 
     const productHasOfferCatalogRepo = await chevre.repository.ProductHasOfferCatalog.createInstance(mongoose.connection);
 
-    const offerCatalogs = (await productHasOfferCatalogRepo.findOfferCatalogs(
-        {
-            limit: 10,
-            page: 1,
-            project: { id: { $eq: project.id } },
-            product: { id: { $in: ['656038908b1cd5ce629f5992', '60c1c0031fb182000bed5eff'] } }
-        }
-    ));
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(offerCatalogs, { depth: null });
+    try {
+        const offerCatalogs = (await productHasOfferCatalogRepo.findOfferCatalogs(
+            {
+                limit: 10,
+                page: 1,
+                project: { id: { $eq: project.id } },
+                product: { id: { $in: ['656038908b1cd5ce629f5992', '60c1c0031fb182000bed5eff'] } }
+            }
+        ));
+        // tslint:disable-next-line:no-null-keyword
+        console.dir(offerCatalogs, { depth: null });
+    } catch (error) {
+        throw await chevre.errorHandler.handleMongoError(error);
+    }
 }
 
 main()

package/example/src/chevre/reIndex.ts

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

package/example/src/chevre/roles/addAdminProductHasOfferCatalogReadPermissionIfNotExists.ts

@@ -0,0 +1,33 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
+
+    const roleNames = [
+        chevre.factory.role.organizationRole.RoleName.InventoryManager
+        // chevre.factory.role.organizationRole.RoleName.SellersOwner,
+        // chevre.factory.role.organizationRole.RoleName.SellersInventoryManager,
+        // chevre.factory.role.organizationRole.RoleName.TicketClerk
+    ];
+    const permissions = [
+        'admin.productHasOfferCatalog.read'
+    ];
+    for (const roleName of roleNames) {
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
+    }
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/errorHandler.d.ts

@@ -1,7 +1,11 @@
+/**
+ * https://www.mongodb.com/ja-jp/docs/manual/reference/error-codes/
+ */
 export declare enum MongoErrorCode {
-    DuplicateKey = 11000,
+    ConflictUpdateOperator = 40,
     MaxTimeMSExpired = 50,
-    ExceededTimeLimit = 262
+    ExceededTimeLimit = 262,
+    DuplicateKey = 11000
 }
 export declare function isMongoError(error: unknown): Promise<boolean>;
 export declare function handleMongoError(error: unknown): Promise<unknown>;

package/lib/chevre/errorHandler.js

@@ -24,11 +24,15 @@ exports.handleAWSError = handleAWSError;
 const http_status_1 = require("http-status");
 const factory_1 = require("./factory");
 let mongo;
+/**
+ * https://www.mongodb.com/ja-jp/docs/manual/reference/error-codes/
+ */
 var MongoErrorCode;
 (function (MongoErrorCode) {
-    MongoErrorCode[MongoErrorCode["DuplicateKey"] = 11000] = "DuplicateKey";
+    MongoErrorCode[MongoErrorCode["ConflictUpdateOperator"] = 40] = "ConflictUpdateOperator";
     MongoErrorCode[MongoErrorCode["MaxTimeMSExpired"] = 50] = "MaxTimeMSExpired";
     MongoErrorCode[MongoErrorCode["ExceededTimeLimit"] = 262] = "ExceededTimeLimit";
+    MongoErrorCode[MongoErrorCode["DuplicateKey"] = 11000] = "DuplicateKey";
 })(MongoErrorCode || (exports.MongoErrorCode = MongoErrorCode = {}));
 function isMongoError(error) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -46,9 +50,11 @@ function handleMongoError(error) {
         let handledError = error;
         if (handledError instanceof mongo.MongoError || handledError instanceof mongo.MongoServerError) {
             switch (handledError.code) {
+                case MongoErrorCode.ConflictUpdateOperator:
+                    handledError = new factory_1.errors.Argument('', `Some updating fields conflict. code:${handledError.code} message:${handledError.message}`);
+                    break;
                 case MongoErrorCode.DuplicateKey:
                     handledError = new factory_1.errors.AlreadyInUse('', [], `Some fields already in use. code:${handledError.code} message:${handledError.message}`);
-                    // no op
                     break;
                 case MongoErrorCode.MaxTimeMSExpired:
                 case MongoErrorCode.ExceededTimeLimit:

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

@@ -48,13 +48,28 @@ export declare class OfferCatalogRepo {
         id: string;
         dateSynced: Date;
     }): Promise<void>;
-    updateManyById(params: {
+    /**
+     * オファーカタログIDリストからitemListElementをまとめて編集する
+     */
+    updateManyOfferCatalogsByIds(params: {
         id: {
             $in: string[];
         };
+        itemOffered: {
+            typeOf: {
+                $eq: factory.product.ProductType;
+            };
+        };
         $push: {
             itemListElement: {
-                $each: factory.offerCatalog.IItemListElement[];
+                /**
+                 * ひとまず要素がOfferのみに対応
+                 */
+                $each: factory.offerCatalog.IItemListElementAsAggregateOffer[];
+                /**
+                 * カタログ内最大要素数
+                 * 指定した数でsliceされる
+                 */
                 $slice: number;
             };
         };

package/lib/chevre/repo/offerCatalog.js

@@ -252,13 +252,16 @@ class OfferCatalogRepo {
                 .exec();
         });
     }
-    updateManyById(params) {
+    /**
+     * オファーカタログIDリストからitemListElementをまとめて編集する
+     */
+    updateManyOfferCatalogsByIds(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!Array.isArray(params.id.$in) || params.id.$in.length === 0) {
                 return;
             }
             const pushItemListElementIds = params.$push.itemListElement.$each.map((element) => element.id);
-            yield this.offerCatalogModel.updateMany(Object.assign({ _id: { $in: params.id.$in } }, (pushItemListElementIds.length > 0)
+            yield this.offerCatalogModel.updateMany(Object.assign({ _id: { $in: params.id.$in }, 'itemOffered.typeOf': { $exists: true, $eq: params.itemOffered.typeOf.$eq } }, (pushItemListElementIds.length > 0)
                 // itemListElementのユニークネスを保証する
                 ? {
                     'itemListElement.id': {

package/package.json

@@ -27,7 +27,7 @@
     "moment-timezone": "^0.5.33",
     "node-fpe": "1.0.0",
     "pug": "^2.0.4",
-    "uniqid": "^5.4.0",
+    "uniqid": "5.4.0",
     "uuid": "^3.4.0"
   },
   "description": "Chevre Domain Library for Node.js",
@@ -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.10"
+  "version": "23.0.0-alpha.12"
 }

package/example/src/chevre/searchOfferCatalogItems.ts

@@ -1,59 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const PROJECT_ID = process.env.PROJECT_ID;
-mongoose.Model.on('index', (...args) => {
-    console.error('******** index event emitted. ********\n', args);
-});
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
-    const offerCatalogRepo = await chevre.repository.OfferCatalog.createInstance(mongoose.connection);
-    const offerCatalogItemRepo = await chevre.repository.OfferCatalogItem.createInstance(mongoose.connection);
-    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
-
-    const result = await (await chevre.service.offer.createService()).event.searchOfferCatalogItems({
-        event: {
-            id: 'bm0f0cadm'
-        },
-        limit: 10,
-        page: 1,
-        options: { includedInDataCatalog: { id: 'blpj322ni' } }
-    })({
-        event: eventRepo,
-        offerCatalog: offerCatalogRepo,
-        offerCatalogItem: offerCatalogItemRepo,
-        product: productRepo
-    });
-    console.log(result);
-    console.log(result.length);
-
-    // console.log('searching...');
-    // const catalogs = await catalogItemRepo.search(
-    //     {
-    //         project: { id: { $eq: PROJECT_ID } },
-    //         sort: { identifier: chevre.factory.sortType.Descending },
-    //         limit: 2,
-    //         page: 1,
-    //         itemListElement: { typeOf: { $eq: 'Offer' } }
-    //     }
-    // );
-    // console.log(catalogs[0]?.id, typeof catalogs[0]?.id);
-    // console.log(catalogs.length);
-
-    // const numCatalogs = await catalogItemRepo.count(
-    //     {
-    //         project: { id: { $eq: PROJECT_ID } },
-    //         itemListElement: { typeOf: { $eq: 'Offer' } }
-    //     }
-    // );
-    // console.log('numCatalogs:', numCatalogs);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);