Merge branch 'develop' into 299-custom-reason-for-application-rejection

.gitignore

@@ -159,3 +159,6 @@ $RECYCLE.BIN/
 
 # Ignore public folder
 /static
+
+# Ignore data dumps from MongoDB
+dump/ 

package.json

@@ -28,7 +28,7 @@
  "babel-plugin-transform-import-meta": "^2.2.0",
  "eslint": "^8.29.0",
  "jest": "^29.3.1",
- "nodemon": "^2.0.20",
+ "nodemon": "^3.0.1",
  "npm-audit-helper": "^3.1.1",
  "supertest": "^6.3.3"
  },

seed.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+mongorestore --uri mongodb://localhost:27017 

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),
 ]);

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) {

src/services/offer.js

@@ -1,10 +1,10 @@
 import mongoose from "mongoose";
-import Company  from "../models/Company.js";
-import Offer  from "../models/Offer.js";
-import Account  from "../models/Account.js";
-import EmailService  from "../lib/emailService.js";
-import { OFFER_DISABLED_NOTIFICATION }  from "../email-templates/companyOfferDisabled.js";
-import OfferConstants  from "../models/constants/Offer.js";
+import Company from "../models/Company.js";
+import Offer from "../models/Offer.js";
+import Account from "../models/Account.js";
+import EmailService from "../lib/emailService.js";
+import { OFFER_DISABLED_NOTIFICATION } from "../email-templates/companyOfferDisabled.js";
+import OfferConstants from "../models/constants/Offer.js";
 import CompanyConstants from "../models/constants/Company.js";
 import base64url from "base64url";
 
@@ -271,10 +271,12 @@ class OfferService {
  * Otherwise, use _buildSearchContinuationQuery().
  */
  _buildInitialSearchQuery(value, showHidden, showAdminReason, filters) {
- const offers = (value ? Offer.find({ "$and": [
- this._buildFilterQuery(filters),
- { "$text": { "$search": value } }
- ] }, { score: { "$meta": "textScore" } }
+ const offers = (value ? Offer.find({
+ "$and": [
+ this._buildFilterQuery(filters),
+ { "$text": { "$search": value } }
+ ]
+ }, { score: { "$meta": "textScore" } }
 
  ) : Offer.find(this._buildFilterQuery(filters)));
 
@@ -294,26 +296,36 @@ class OfferService {
  offers = Offer.aggregate([
  { $match: { $text: { $search: value } } },
  { $match: this._buildFilterQuery(filters) },
- { $addFields: {
- score: { $meta: "textScore" },
- adminReason: { $cond: [showAdminReason, "$adminReason", "$$REMOVE"] }
- } },
- { $match: { "$or": [
- { score: { "$lt": lastOfferScore } },
- { score: lastOfferScore, [lastSortField]: { [sortFieldOperator]: lastSortValue } },
- { score: lastOfferScore, [lastSortField]: lastSortValue, _id: { "$gt": ObjectId(lastOfferId) } }
- ] } },
+ {
+ $addFields: {
+ score: { $meta: "textScore" },
+ adminReason: { $cond: [showAdminReason, "$adminReason", "$$REMOVE"] }
+ }
+ },
+ {
+ $match: {
+ "$or": [
+ { score: { "$lt": lastOfferScore } },
+ { score: lastOfferScore, [lastSortField]: { [sortFieldOperator]: lastSortValue } },
+ { score: lastOfferScore, [lastSortField]: lastSortValue, _id: { "$gt": ObjectId(lastOfferId) } }
+ ]
+ }
+ },
  { $match: Offer.filterCurrent() },
  { $match: showHidden ? {} : Offer.filterNonHidden() }
  ]);
  } else {
- offers = Offer.find({ "$and": [
- this._buildFilterQuery(filters),
- { "$or": [
- { [lastSortField]: { [sortFieldOperator]: lastSortValue } },
- { [lastSortField]: lastSortValue, _id: { "$gt": ObjectId(lastOfferId) } }
- ] }
- ] });
+ offers = Offer.find({
+ "$and": [
+ this._buildFilterQuery(filters),
+ {
+ "$or": [
+ { [lastSortField]: { [sortFieldOperator]: lastSortValue } },
+ { [lastSortField]: lastSortValue, _id: { "$gt": ObjectId(lastOfferId) } }
+ ]
+ }
+ ]
+ });
 
  this.selectSearchOffers(offers, showHidden, showAdminReason);
  }
@@ -336,10 +348,12 @@ class OfferService {
  {
  "$and": [
  { jobMinDuration: { "$lt": jobMinDuration } },
- { "$or": [
- { jobMaxDuration: { "$exists": false } },
- { jobMaxDuration: { "$gte": jobMinDuration } },
- ] }
+ {
+ "$or": [
+ { jobMaxDuration: { "$exists": false } },
+ { jobMaxDuration: { "$gte": jobMinDuration } },
+ ]
+ }
  ]
  },
  ]
@@ -353,17 +367,19 @@ class OfferService {
  {
  "$and": [
  { jobMaxDuration: { "$gt": jobMaxDuration } },
- { "$or": [
- { jobMinDuration: { "$exists": false } },
- { jobMinDuration: { "$lte": jobMaxDuration } },
- ] }
+ {
+ "$or": [
+ { jobMinDuration: { "$exists": false } },
+ { jobMinDuration: { "$lte": jobMaxDuration } },
+ ]
+ }
  ]
  },
  ]
  });
  }
- if (fields?.length) constraints.push({ fields: {  "$elemMatch": { "$in": fields } } });
- if (technologies?.length) constraints.push({ technologies: {  "$elemMatch": { "$in": technologies } } });
+ if (fields?.length) constraints.push({ fields: { "$elemMatch": { "$in": fields } } });
+ if (technologies?.length) constraints.push({ technologies: { "$elemMatch": { "$in": technologies } } });
 
  return constraints.length ? { "$and": constraints } : {};
  }