Merge branch 'master-qa' of github.com:LucasBrazi06/ev-server into ma…

…ster-qa
sap-labs-france · Dec 7, 2021 · 4642bdb · 4642bdb
2 parents 85991a2 + d4f8fca
commit 4642bdb
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/src/server/rest/v1/service/PricingService.ts b/src/server/rest/v1/service/PricingService.ts
@@ -68,7 +68,7 @@ export default class PricingService {
       pricingDefinitions.projectFields = authorizationPricingDefinitionsFilter.projectFields;
     }
     // Add Auth flags
-    await AuthorizationService.addPricingDefinitionsAuthorizations(req.tenant, req.user, pricingDefinitions , authorizationPricingDefinitionsFilter);
+    await AuthorizationService.addPricingDefinitionsAuthorizations(req.tenant, req.user, pricingDefinitions, authorizationPricingDefinitionsFilter);
     // Alter the canCreate flag according to the pricing definition context
     pricingDefinitions.canCreate = await PricingService.alterCanCreate(req, action, filteredRequest.EntityType, filteredRequest.EntityID, pricingDefinitions.canCreate);
     res.json(pricingDefinitions);
@@ -95,6 +95,10 @@ export default class PricingService {
     }
     // Check authorization and get the site ID depending on the entity type
     const siteID = await PricingService.checkAuthorizationAndGetSiteID(req, action, filteredRequest.entityType, filteredRequest.entityID);
+    // Check that the pricing definitions can be changed for that site
+    if (siteID) {
+      await UtilsService.checkAndGetSiteAuthorization(req.tenant, req.user, siteID, Action.MAINTAIN_PRICING_DEFINITIONS, action);
+    }
     // Create pricing
     const newPricingDefinition: PricingDefinition = {
       ...filteredRequest,
@@ -126,21 +130,25 @@ export default class PricingService {
     // Check Mandatory fields
     UtilsService.checkIfPricingDefinitionValid(filteredRequest, req);
     // Check and Get Pricing
-    const pricingDefinition = await UtilsService.checkAndGetPricingDefinitionAuthorization(
+    let pricingDefinition = await UtilsService.checkAndGetPricingDefinitionAuthorization(
       req.tenant, req.user, filteredRequest.id, Action.UPDATE, action, filteredRequest);
+    // Update timestamp
+    const lastChangedBy = { id: req.user.id };
+    const lastChangedOn = new Date();
     // Check authorization and get the site ID depending on the entity type
     const siteID = await PricingService.checkAuthorizationAndGetSiteID(req, action, filteredRequest.entityType, filteredRequest.entityID);
+    // Check that the pricing definitions can be changed for that site
+    if (siteID) {
+      await UtilsService.checkAndGetSiteAuthorization(req.tenant, req.user, siteID, Action.MAINTAIN_PRICING_DEFINITIONS, action);
+    }
     // Update
-    pricingDefinition.entityID = filteredRequest.entityID;
-    pricingDefinition.entityType = filteredRequest.entityType;
-    pricingDefinition.name = filteredRequest.name;
-    pricingDefinition.description = filteredRequest.description;
-    pricingDefinition.staticRestrictions = filteredRequest.staticRestrictions;
-    pricingDefinition.restrictions = filteredRequest.restrictions;
-    pricingDefinition.dimensions = filteredRequest.dimensions;
-    pricingDefinition.lastChangedBy = { 'id': req.user.id };
-    pricingDefinition.lastChangedOn = new Date();
-    pricingDefinition.siteID = siteID;
+    pricingDefinition = {
+      ...pricingDefinition,
+      ...filteredRequest,
+      lastChangedBy,
+      lastChangedOn,
+      siteID
+    };
     // Update Pricing
     await PricingStorage.savePricingDefinition(req.tenant, pricingDefinition);
     // Log
@@ -164,6 +172,12 @@ export default class PricingService {
     // Check and Get Pricing
     const pricingDefinition = await UtilsService.checkAndGetPricingDefinitionAuthorization(
       req.tenant, req.user, pricingDefinitionID, Action.DELETE, action);
+    // Check authorization and get the site ID depending on the entity type
+    const siteID = await PricingService.checkAuthorizationAndGetSiteID(req, action, pricingDefinition.entityType, pricingDefinition.entityID);
+    // Check that the pricing definitions can be changed for that site
+    if (siteID) {
+      await UtilsService.checkAndGetSiteAuthorization(req.tenant, req.user, siteID, Action.MAINTAIN_PRICING_DEFINITIONS, action);
+    }
     // Delete
     await PricingStorage.deletePricingDefinition(req.tenant, pricingDefinition.id);
     // Log

diff --git a/src/storage/mongodb/CarStorage.ts b/src/storage/mongodb/CarStorage.ts
@@ -523,6 +523,7 @@ export default class CarStorage {
                 $concat: [
                   `${Utils.buildRestServerURL()}/v1/util/car-catalogs/`,
                   '$carCatalog.id',
+                  '/image',
                   {
                     $ifNull: [{ $concat: ['?LastChangedOn=', { $toString: '$carCatalog.lastChangedOn' }] }, ''] // Only concat 'lastChangedOn' if not null
                   }