Merge branch 'develop' into 346-add-independent-jobs

NIAEFEUP · Mar 27, 2024 · 525ba4d · 525ba4d
2 parents 02c7145 + 82886d0
commit 525ba4d
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 36 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/api/middleware/validators/company.js b/src/api/middleware/validators/company.js
@@ -131,6 +131,4 @@ export const edit = useExpressValidators([
         .withMessage(ValidationReasons.ARRAY_SIZE(CompanyConstants.contacts.min_length, CompanyConstants.contacts.max_length)),
     body("logo", ValidationReasons.DEFAULT)
         .optional()
-        .isString().withMessage(ValidationReasons.STRING).bail()
-        .isURL().withMessage(ValidationReasons.URL),
 ]);
diff --git a/src/api/routes/company.js b/src/api/routes/company.js
@@ -13,7 +13,7 @@ import { concurrentOffersNotExceeded } from "../middleware/validators/validatorU
 
 import { or } from "../middleware/utils.js";
 
-import * as fileMiddleware  from "../middleware/files.js";
+import * as fileMiddleware from "../middleware/files.js";
 import OfferService from "../../services/offer.js";
 import AccountService from "../../services/account.js";
 import Offer from "../../models/Offer.js";
@@ -245,7 +245,8 @@ export default (app) => {
             try {
                 const companyService = new CompanyService();
                 const offerService = new OfferService();
-                const company = await companyService.changeAttributes(req.params.companyId, req.body);
+                const logo = req.file && (req?.file?.url || `${config.webserver_host}/static/${req.file.filename}`);
+                const company = await companyService.changeAttributes(req.params.companyId, { ...req.body, logo });
                 await offerService.updateAllOffersByCompanyId(company);
                 return res.json(company);
             } catch (err) {