@chevre/domain 22.14.0-alpha.27 → 22.14.0-alpha.29

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

@@ -9,10 +9,12 @@ async function main() {
     const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
     let roleNames = [
-        chevre.factory.role.organizationRole.RoleName.InventoryManager
+        chevre.factory.role.organizationRole.RoleName.InventoryManager,
+        chevre.factory.role.organizationRole.RoleName.SellersOwner,
+        chevre.factory.role.organizationRole.RoleName.SellersInventoryManager
     ];
     let permissions = [
-        'admin.productOffers.*'
+        'admin.sellers.productOffers.*'
     ];
     for (const roleName of roleNames) {
         for (const permission of permissions) {
@@ -25,12 +27,10 @@ async function main() {
     }
 
     roleNames = [
-        chevre.factory.role.organizationRole.RoleName.SellersOwner,
-        chevre.factory.role.organizationRole.RoleName.SellersInventoryManager,
         chevre.factory.role.organizationRole.RoleName.TicketClerk
     ];
     permissions = [
-        'admin.productOffers.read'
+        'admin.sellers.productOffers.read'
     ];
     for (const roleName of roleNames) {
         for (const permission of permissions) {

package/lib/chevre/repo/productOffer.js

@@ -33,7 +33,7 @@ class ProductOfferRepo {
         this.productOfferModel = connection.model(productOffer_1.modelName, (0, productOffer_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         const andConditions = [];
         const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
         if (typeof idEq === 'string') {
@@ -63,15 +63,19 @@ class ProductOfferRepo {
         if (typeof offeredByIdEq === 'string') {
             andConditions.push({ 'offeredBy.id': { $eq: offeredByIdEq } });
         }
-        const validForMemberTierIdentifierEq = (_o = (_m = params.validForMemberTier) === null || _m === void 0 ? void 0 : _m.identifier) === null || _o === void 0 ? void 0 : _o.$eq;
+        const sellerByIdEq = (_o = (_m = params.seller) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$eq;
+        if (typeof sellerByIdEq === 'string') {
+            andConditions.push({ 'offeredBy.id': { $eq: sellerByIdEq } });
+        }
+        const validForMemberTierIdentifierEq = (_q = (_p = params.validForMemberTier) === null || _p === void 0 ? void 0 : _p.identifier) === null || _q === void 0 ? void 0 : _q.$eq;
         if (typeof validForMemberTierIdentifierEq === 'string') {
             andConditions.push({ 'validForMemberTier.identifier': { $exists: true, $eq: validForMemberTierIdentifierEq } });
         }
-        const validFromLte = (_p = params.validFrom) === null || _p === void 0 ? void 0 : _p.$lte;
+        const validFromLte = (_r = params.validFrom) === null || _r === void 0 ? void 0 : _r.$lte;
         if (validFromLte instanceof Date) {
             andConditions.push({ validFrom: { $lte: validFromLte } });
         }
-        const validThroughGte = (_q = params.validThrough) === null || _q === void 0 ? void 0 : _q.$gte;
+        const validThroughGte = (_s = params.validThrough) === null || _s === void 0 ? void 0 : _s.$gte;
         if (validThroughGte instanceof Date) {
             andConditions.push({ validThrough: { $gte: validThroughGte } });
         }

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -78,6 +78,10 @@ function validateMemberTier(params) {
         if (memberProgramIdentifier !== memberProgramIdentifierMustBe) {
             throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'member program not matched');
         }
+        const sellerId = event.offers.seller.id;
+        if (typeof sellerId !== 'string' || sellerId === '') {
+            throw new factory.errors.NotFound('event.offers.seller.id');
+        }
         // 有効なプロダクトオファーを検証
         const productOfferForMemberTier = (yield repos.productOffer.findProductOffers({
             limit: 1,
@@ -87,7 +91,8 @@ function validateMemberTier(params) {
             itemOffered: { identifier: { $eq: aggregateOfferIdentifier } }, // オファーコレクションコード
             validForMemberTier: { identifier: { $eq: tierIdentifier } },
             validFrom: { $lte: acceptedDate.toDate() },
-            validThrough: { $gte: acceptedDate.toDate() }
+            validThrough: { $gte: acceptedDate.toDate() },
+            offeredBy: { id: { $eq: sellerId } } // オファー提供者も検証する
         }, ['identifier'])).shift();
         if (productOfferForMemberTier === undefined) {
             throw new factory.errors.NotFound(factory.offerType.Offer, 'valid product offers for member tier not found');

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": "4.399.0-alpha.23",
-    "@cinerino/sdk": "12.3.0",
+    "@chevre/factory": "4.399.0-alpha.24",
+    "@cinerino/sdk": "12.4.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": "22.14.0-alpha.27"
+  "version": "22.14.0-alpha.29"
 }