Added price history log.

app/common/enums.js

@@ -216,8 +216,7 @@ const AD_STATUS = {
   STATUS_DELETED: 4,
   STATUS_URGENT: 5,
   STATUS_DISCOUNTED: 6,
-  STATUS_RENTED: 7,
-  STATUS_VIP: 8
+  STATUS_RENTED: 7
 };
 
 const AD_AGENCY = {

app/config/appConfig.js

@@ -32,11 +32,6 @@ const PRINT_CRAWLER_DEBUG = process.env.PRINT_CRAWLER_DEBUG_INFO || 0;
 
 const API_MAP_KEY = process.env.API_MAP_KEY || "";
 
-const PROSTOR_LOGIN = {
-  EMAIL: process.env.PROSTOR_LOGIN_EMAIL,
-  PASSWORD: process.env.PROSTOR_LOGIN_PASS
-};
-
 module.exports = {
   APP_PORT,
   APP_URL,
@@ -47,6 +42,5 @@ module.exports = {
   MAX_REAL_ESTATES_IN_EMAIL,
   MAX_REAL_ESTATES_IN_FIRST_EMAIL,
   PRINT_CRAWLER_DEBUG,
-  API_MAP_KEY,
-  PROSTOR_LOGIN
+  API_MAP_KEY
 };

app/controllers/realEstates.js

@@ -2,14 +2,13 @@
 const {
   findRealEstatesForSearchRequest
 } = require("../helpers/db/searchRequestMatch");
-const { AD_STATUS } = require("../common/enums");
 
 const getRealEstates = async (req, res) => {
   const searchRequestId = req.params["searchRequestId"] || "";
   const realEstates = await findRealEstatesForSearchRequest(searchRequestId);
 
   const title = "Nekretnine koje odgovaraju Vašim uslovima pretrage";
-  res.render("realEstates", { realEstates, title, AD_STATUS });
+  res.render("realEstates", { realEstates, title });
 };
 
 module.exports = {

app/controllers/redirect.js

@@ -1,11 +1,9 @@
 const { getRealEstateById } = require("../helpers/db/realEstate");
-const { AD_STATUS } = require("../common/enums");
 
 const getRedirect = async (req, res) => {
   const id = req.params.id || null;
   let error = false;
   let redirectUrl = undefined;
-  let vipAd = undefined;
   if (!id) {
     error = true;
   } else {
@@ -15,7 +13,6 @@ const getRedirect = async (req, res) => {
         error = true;
       } else {
         redirectUrl = realEstate.url;
-        vipAd = realEstate.adStatus === AD_STATUS.STATUS_VIP;
       }
     } catch (e) {
       error = true;
@@ -27,7 +24,7 @@ const getRedirect = async (req, res) => {
     res.render("notFound", { title });
   } else {
     const title = "Preusmjeravanje";
-    res.render("redirect", { title, redirectUrl, vipAd });
+    res.render("redirect", { title, redirectUrl });
   }
 };
 

app/crawler/savers/postgres.js

@@ -1,6 +1,7 @@
 const moment = require("moment");
 
 const { bulkUpsertRealEstates } = require("../../helpers/db/realEstate");
+const { bulkUpsertPriceHistory } = require("../../helpers/db/priceHistory");
 
 class PostgresSaver {
   connect() {
@@ -11,6 +12,21 @@ class PostgresSaver {
 
   async save(results) {
     const savedRecords = await bulkUpsertRealEstates(results);
+    //Extruding data for price history table
+    const resultPrices = savedRecords.map(realEstate => {
+      //Null values canot be recognized by ignore duplicates in sequalize
+      //Value price = 0 indicates 'cijena na upit'
+      const priceTmp =
+        realEstate.dataValues.price === null ? 0 : realEstate.dataValues.price;
+
+      return {
+        realEstateId: realEstate.dataValues.id,
+        price: priceTmp,
+        createdAt: realEstate.dataValues.createdAt,
+        updatedAt: realEstate.dataValues.updatedAt
+      };
+    });
+    const savedPrices = await bulkUpsertPriceHistory(resultPrices);
 
     if (Array.isArray(savedRecords)) {
       const newRealEstates = [];

app/crawler/specificCrawlers/prostor.js

@@ -3,7 +3,6 @@
 const fetch = require("node-fetch");
 const cheerio = require("cheerio");
 const moment = require("moment-timezone");
-const FormData = require("form-data");
 
 const {
   AD_TYPE,
@@ -17,8 +16,7 @@ const {
 
 const {
   PRINT_CRAWLER_DEBUG,
-  DEFAULT_TIMEZONE,
-  PROSTOR_LOGIN
+  DEFAULT_TIMEZONE
 } = require("../../config/appConfig");
 const { PROSTOR_FORCE_CRAWL } = require("../specificConfigs/prostor");
 
@@ -62,16 +60,13 @@ class ProstorCrawler {
 
   async crawl() {
     const crawlAdCategories = this.crawlerAdCategories;
-    //We need session cookie to use login privileges
-    const prostorCookie = await this.getCookies();
-    //New tag to check if crawler loged in
-    const login = await this.loginForScraping(PROSTOR_LOGIN, prostorCookie);
+
     const newRealEstates = [];
-    //Crawl only if login was successful
-    if (crawlAdCategories && login) {
+
+    if (crawlAdCategories) {
       const indexGenerators = [];
       for (const adCategory of crawlAdCategories) {
-        indexGenerators.push(this.categoryIndexer(adCategory, prostorCookie));
+        indexGenerators.push(this.categoryIndexer(adCategory));
       }
 
       let done = false;
@@ -124,14 +119,13 @@ class ProstorCrawler {
     return newRealEstates;
   }
 
-  async *categoryIndexer(adCategory, prostorCookie) {
+  async *categoryIndexer(adCategory) {
     const urlAdTypePart = PROSTOR_ENUMS.PROSTOR_AD_TYPE[this.crawlerAdTypes];
     const urlCategoryPart = PROSTOR_ENUMS.PROSTOR_AD_CATEGORY[adCategory];
     if (urlAdTypePart !== undefined && urlCategoryPart !== undefined) {
       const urlPageToCrawl = `${this.baseUrl}?remove_sold=0${urlAdTypePart}${urlCategoryPart}`;
       const listOfAllRealEstates = await this.extractRealEstates(
-        urlPageToCrawl,
-        prostorCookie
+        urlPageToCrawl
       );
 
       let elementToStartIndexFrom = 0;
@@ -145,8 +139,7 @@ class ProstorCrawler {
           elementToStartIndexFrom += realEstatesForSinglePage.length;
 
           const singlePageResults = await this.indexSinglePage(
-            realEstatesForSinglePage,
-            prostorCookie
+            realEstatesForSinglePage
           );
 
           const filteredSinglePageResults = singlePageResults.filter(
@@ -170,10 +163,10 @@ class ProstorCrawler {
     }
   }
 
-  async indexSinglePage(realEstatesList, prostorCookie) {
+  async indexSinglePage(realEstatesList) {
     const asyncActions = [];
     for (const realEstate of realEstatesList) {
-      asyncActions.push(this.scrapeAd(realEstate, prostorCookie));
+      asyncActions.push(this.scrapeAd(realEstate));
     }
 
     try {
@@ -187,25 +180,12 @@ class ProstorCrawler {
     }
   }
 
-  async scrapeAd(realEstate, prostorCookie) {
+  async scrapeAd(realEstate) {
     const { lat, lng, property_name, price, size, link, status } = realEstate;
-
-    //Status information is given already in realestate list
-    //For VIP Ads status ='' canot be used, but no VIP ads are crawled
-    //We will make "fake" vip ad for RE that have size=55
-    //It is weird because yesterday it said 'VIP ponuda' ???
-    const adStatus =
-      size === "55"
-        ? ProstorCrawler.getStatusId("VIP ponuda")
-        : ProstorCrawler.getStatusId(status);
-
     const url = `https://prostor.ba${link}`;
-
     // console.log("[PROSTOR] Scraping : ", url);
     try {
-      const adPageSource = await fetch(url, {
-        headers: { Cookie: prostorCookie }
-      });
+      const adPageSource = await fetch(url);
       const body = await adPageSource.text();
       const $ = cheerio.load(body);
 
@@ -350,6 +330,7 @@ class ProstorCrawler {
         furnishingType = FURNISHING_TYPE.NOT_FURNISHED.id;
       }
 
+      const adStatus = ProstorCrawler.getStatusId(status);
       const title = property_name;
       const parsedPrice = parseFloat(price.replace(/\./g, "")) || null;
       const parsedArea = parseFloat(size);
@@ -427,15 +408,13 @@ class ProstorCrawler {
     }
   }
 
-  async extractRealEstates(url, prostorCookie) {
+  async extractRealEstates(url) {
     if (PRINT_CRAWLER_DEBUG) {
       console.log("[PROSTOR] Index page : ", url);
     }
 
     try {
-      const res = await fetch(url, {
-        headers: { Cookie: prostorCookie }
-      });
+      const res = await fetch(url);
       const body = await res.text();
       const $ = cheerio.load(body);
 
@@ -569,8 +548,6 @@ class ProstorCrawler {
         return AD_STATUS.STATUS_SOLD;
       case "Iznajmljeno":
         return AD_STATUS.STATUS_RENTED;
-      case "VIP ponuda":
-        return AD_STATUS.STATUS_VIP;
       default:
         console.log("[PROSTOR] Unknown AD_STATUS : [", statusText, "]");
         return AD_STATUS.STATUS_NORMAL;
@@ -592,51 +569,6 @@ class ProstorCrawler {
     return savers[0].save(results);
     //so that we can use some sequelize options and information when data is inserted
   }
-  async loginForScraping(PROSTOR_LOGIN, prostorCookie) {
-    let formData = new FormData();
-    formData.append("email", PROSTOR_LOGIN.EMAIL);
-    formData.append("password", PROSTOR_LOGIN.PASSWORD);
-
-    return fetch("https://prostor.ba/moj-prostor/prijava", {
-      method: "POST",
-      body: formData,
-      headers: { Cookie: prostorCookie }
-    })
-      .then(page => {
-        return page.text();
-      })
-      .then(resp => {
-        const $ = cheerio.load(resp);
-        if (
-          $("h1")
-            .text()
-            .indexOf("Dobrodošli") !== -1
-        ) {
-          console.log("[PROSTOR]: Crawler loged in!");
-          return true;
-        } else {
-          console.log("[PROSTOR]: Crawler login failed - wrong credentials!");
-          return false;
-        }
-      })
-      .catch(err => {
-        console.log("[PROSTOR]: Crawler login error ", err);
-      });
-  }
-  async getCookies() {
-    const getResponse = await fetch("https://prostor.ba/moj-prostor/prijava", {
-      headers: { Cookie: "" }
-    });
-    const raw = getResponse.headers.raw()["set-cookie"];
-    const cookie = raw
-      .map(datastring => {
-        const data = datastring.split(";");
-        const cookieData = data[0];
-        return cookieData;
-      })
-      .join(";");
-    return cookie;
-  }
 }
 
 module.exports = ProstorCrawler;

app/helpers/db/priceHistory.js

@@ -0,0 +1,20 @@
+"use strict";
+const db = require("../../models/index");
+const sequelize = require("sequelize");
+
+const bulkUpsertPriceHistory = async priceHistoryData => {
+  try {
+    const order = [["realEstateId", "desc"]];
+
+    return await db.PriceHistory.bulkCreate(priceHistoryData, {
+      order,
+      ignoreDuplicates: true
+    });
+  } catch (e) {
+    console.log("Error bulk upserting priceHistory : ", e);
+  }
+};
+
+module.exports = {
+  bulkUpsertPriceHistory
+};

app/helpers/emailContentGenerator.js

@@ -23,19 +23,16 @@ const generateRealEstateLinks = realEstates => {
 const generateNotificationEmail = (
   realEstates,
   searchRequestId,
-  noAllRealEstates,
   dailyNotification = false
 ) => {
   const truncateList = realEstates.length > MAX_REAL_ESTATES_IN_EMAIL;
-
   const realEstatesToShow = truncateList
     ? realEstates.slice(0, MAX_REAL_ESTATES_IN_EMAIL)
     : realEstates;
 
   const allRealEstatesLink = `${APP_URL}/nekretnine/${searchRequestId}`;
-
   const realEstateLinks = generateRealEstateLinks(realEstatesToShow);
-  const moreRealEstates = `<div>Kompletan spisak nekretnina (${noAllRealEstates}) možete pogledati na <a href="${allRealEstatesLink}">listi nekretnina</a><div>`;
+  const moreRealEstates = `<div>Kompletan spisak nekretnina možete pogledati na <a href="${allRealEstatesLink}">listi nekretnina</a><div>`;
   const emailFooter = generateEmailFooter(searchRequestId);
   const asapMessageBody =
     realEstates.length > 1
@@ -73,7 +70,6 @@ const generateNewSearchRequestEmail = (searchRequest, matchingRealEstates) => {
   } = searchRequest;
 
   const realEstateLinks = generateRealEstateLinks(matchingRealEstates);
-
   const instantRealEstatesText = `<br/>
        <div>
         U međuvremenu pogledajte neke od nedavno objavljenih nekretnina koje odgovaraju Vašim uslovima pretrage :<br/>

app/migrations/20200121000524-add-priceHistory-table.js

@@ -0,0 +1,42 @@
+"use strict";
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    const tableFields = {
+      id: {
+        type: Sequelize.BIGINT,
+        autoIncrement: true,
+        allowNull: false,
+        primaryKey: true
+      },
+      realEstateId: {
+        type: Sequelize.BIGINT,
+        allowNull: false,
+        unique: "uniquePriceRealEstate",
+        references: {
+          model: "RealEstates",
+          key: "id"
+        },
+        onUpdate: "CASCADE",
+        onDelete: "SET NULL"
+      },
+      price: {
+        type: Sequelize.REAL,
+        unique: "uniquePriceRealEstate"
+      },
+      createdAt: {
+        type: Sequelize.DATE,
+        defaultValue: Sequelize.literal("NOW()")
+      },
+      updatedAt: {
+        type: Sequelize.DATE,
+        defaultValue: Sequelize.literal("NOW()")
+      }
+    };
+    return queryInterface.createTable("PriceHistory", tableFields);
+  },
+
+  down: queryInterface => {
+    return queryInterface.dropTable("PriceHistory", {});
+  }
+};

app/migrations/20200121094500-add-constraint-priceHistory.js

@@ -0,0 +1,10 @@
+"use strict";
+module.exports = {
+  up: (queryInterface, Sequelize) =>
+    queryInterface.addConstraint("PriceHistory", ["realEstateId", "price"], {
+      type: "unique",
+      name: "uniquePriceRealEstate"
+    }),
+  down: queryInterface =>
+    queryInterface.removeConstraint("PriceHistory", "uniquePriceRealEstate")
+};

app/models/priceHistory.js

@@ -0,0 +1,44 @@
+"use strict";
+
+module.exports = (sequalize, DataTypes) => {
+  const PriceHistory = sequalize.define(
+    "PriceHistory",
+    {
+      id: {
+        type: DataTypes.BIGINT,
+        autoIncrement: true,
+        primaryKey: true,
+        allowNull: false
+      },
+      realEstateId: {
+        type: DataTypes.BIGINT,
+        allowNull: false,
+        unique: "uniquePriceRealEstate",
+        references: {
+          model: "RealEstates",
+          key: "id"
+        },
+        onUpdate: "CASCADE",
+        onDelete: "SET NULL"
+      },
+      price: {
+        type: DataTypes.REAL,
+        unique: "uniquePriceRealEstate"
+      }
+    },
+    {
+      freezeTableName: true
+    }
+  );
+
+  PriceHistory.associate = models => {
+    PriceHistory.hasMany(models.RealEstate, {
+      foreignKey: "id",
+      sourceKey: "realEstateId",
+      targetKey: "id",
+      as: "realEstates"
+    });
+  };
+
+  return PriceHistory;
+};

app/public/main.css

@@ -154,7 +154,3 @@ h3 {
   margin-top: 2rem;
   margin-bottom: 1rem;
 }
-
-.estates-link {
-  color: rgba(0, 0, 0, 0.87);
-}

app/seeders/20200121150443-initial-price-history.js

@@ -0,0 +1,34 @@
+"use strict";
+
+const { RealEstate } = require("../models");
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    //Reading initial data from RealEstate table in db
+    const realEstateInitialData = await RealEstate.findAll();
+    //Extruding data for table PriceHistory
+    const priceHistoryInitialData = realEstateInitialData.map(realEstate => {
+      //Null values canot be recognized by ignore duplicates in sequalize
+      //Value price = 0 indicates 'cijena na upit'
+      const priceTmp =
+        realEstate.dataValues.price === null ? 0 : realEstate.dataValues.price;
+
+      return {
+        realEstateId: realEstate.dataValues.id,
+        price: priceTmp,
+        createdAt: realEstate.dataValues.createdAt,
+        updatedAt: realEstate.dataValues.updatedAt
+      };
+    });
+
+    return queryInterface.bulkInsert(
+      "PriceHistory",
+      priceHistoryInitialData,
+      {}
+    );
+  },
+
+  async down(queryInterface, Sequelize) {
+    return queryInterface.bulkDelete("PriceHistory", null, {});
+  }
+};

app/services/notificationService.js

@@ -8,10 +8,7 @@ const {
   generateNewSearchRequestEmail,
   generateEmailSubject
 } = require("../helpers/emailContentGenerator");
-const {
-  findNotNotifiedMatches,
-  findRealEstatesForSearchRequest
-} = require("../helpers/db/searchRequestMatch");
+const { findNotNotifiedMatches } = require("../helpers/db/searchRequestMatch");
 const { sendEmail } = require("../services/emailService");
 
 const notifyForNewRealEstates = async newRealEstates => {
@@ -42,18 +39,10 @@ const notifyMatches = async (matches, dailyNotification = false) => {
     const { email, subscribed } = searchRequest;
     if (notifyNow && subscribed) {
       const allMatchingRealEstates = matches[id].realEstates || [];
-
-      //Variable allMatchingRealEstates are real estates that are "new" on the market
-      //the ones that we notify user in this moment, not all that already exists in db
-      //New variable allRealEstates are all real estates that exists in db for search req
-      const allRealEstates = await findRealEstatesForSearchRequest(id);
-      const noAllRealEstates = allRealEstates.length;
-
       if (allMatchingRealEstates.length > 0) {
         const emailContent = generateNotificationEmail(
           allMatchingRealEstates,
           id,
-          noAllRealEstates,
           dailyNotification
         );
         const emailSubject = generateEmailSubject(

app/views/realEstates.ejs

@@ -1,29 +1,13 @@
 <div class="row center-align">
-  <ul class="collection with-header">
-    <% for(const realEstate of realEstates) { %>
-    <li class="collection-item">
-      <% if(realEstate.adStatus === AD_STATUS.STATUS_VIP) {%>
-      <div>
-        <% //This needs to do redirecting instead of direct link to realestate
-        %>
-        <a href="/redirect/<%= realEstate.id %>" class="estates-link">
-          <%= realEstate.title %>
-          <div class="kivi-color secondary-content">
+    <ul class="collection with-header">
+      <% for(const realEstate of realEstates) { %>
+      <li class="collection-item">
+        <div><%= realEstate.title %>
+          <a href="<%= realEstate.url %>" class="kivi-color secondary-content">
             <i class="material-icons">send</i>
-          </div>
-        </a>
-      </div>
-      <%} else { %>
-      <div>
-        <a href="<%= realEstate.url %>" class="estates-link">
-          <%= realEstate.title %>
-          <div class="kivi-color secondary-content">
-            <i class="material-icons">send</i>
-          </div>
-        </a>
-      </div>
-      <% }%>
-    </li>
-    <% } %>
-  </ul>
-</div>
+          </a>
+        </div>
+      </li>
+      <% } %>
+    </ul>
+  </div>

app/views/redirect.ejs

@@ -1,49 +1,26 @@
-<br /><br />
+<br><br>
 <div class="center">
-  <div class="preloader-wrapper big active center">
-    <div class="kivi-spinner-color spinner-layer spinner-green-only">
-      <div class="circle-clipper left">
-        <div class="circle"></div>
-      </div>
-      <div class="gap-patch">
-        <div class="circle"></div>
-      </div>
-      <div class="circle-clipper right">
-        <div class="circle"></div>
-      </div>
+    <div class="preloader-wrapper big active center">
+        <div class="kivi-spinner-color spinner-layer spinner-green-only">
+            <div class="circle-clipper left">
+                <div class="circle"></div>
+            </div><div class="gap-patch">
+                <div class="circle"></div>
+            </div><div class="circle-clipper right">
+                <div class="circle"></div>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
 
-<br />
-<% if(vipAd) { %>
+<br>
 <div class="center">
-  <h6>
-    Ovaj oglas zahtijeva da budete član
-    <a href="https://prostor.ba/" rel="noreferrer">Prostor.ba</a>.
-    <br />
-    <br />
-    <a href="https://prostor.ba/moj-prostor/prijava" rel="noreferrer"
-      >Ulogujte se</a
-    >
-    ili napravite
-    <a href="https://prostor.ba/moj-prostor/registracija" rel="noreferrer"
-      >novi račun</a
-    >, a potom otvorite <a href="<%= redirectUrl %>" rel="noreferrer">oglas</a>.
-  </h6>
+    <h6>
+        <a href="<%= redirectUrl %>" rel="noreferrer" id="realEstateUrl">Kliknite ovdje ako Vas web preglednik ne preusmjeri automatski</a>
+    </h6>
 </div>
-<% } else { %>
-<div class="center">
-  <h6>
-    <a href="<%= redirectUrl %>" rel="noreferrer" id="realEstateUrl"
-      >Kliknite ovdje ako Vas web preglednik ne preusmjeri automatski</a
-    >
-  </h6>
-</div>
-<% }%>
-
 <script>
-  window.onload = function() {
-    document.getElementById("realEstateUrl").click();
-  };
+    window.onload = function() {
+        document.getElementById('realEstateUrl').click();
+    }
 </script>

development.env

@@ -51,8 +51,6 @@ PROSTOR_CRAWLER_AD_CATEGORIES=comma separated list of enum names of categories t
 PROSTOR_IGNORED_USERNAMES=!!! This is not used for prostor crawler !!!
 PROSTOR_DELAY_BETWEEN_PAGES=!!! This is not used for prostor crawler !!!
 PROSTOR_FORCE_CRAWL=Non-zero value will force crawler to crawl all pages without stopping when known real estate is found
-PROSTOR_LOGIN_EMAIL=Email of valid Prostor.ba account for crawling purposes
-PROSTOR_LOGIN_PASS=Password of valid Prostor.ba account for crawling purposes
 #==AKTIDO==
 AKTIDO_MAX_PAGES=Restrict crawler to this number of pages
 AKTIDO_MAX_RESULTS_PER_PAGE=Only this number or less results from one page will be scraped and saved

package-lock.json

@@ -1346,23 +1346,13 @@
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
-      "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
       "requires": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
+        "combined-stream": "^1.0.6",
         "mime-types": "^2.1.12"
-      },
-      "dependencies": {
-        "combined-stream": {
-          "version": "1.0.8",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-          "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-          "requires": {
-            "delayed-stream": "~1.0.0"
-          }
-        }
       }
     },
     "forwarded": {
@@ -3440,18 +3430,6 @@
         "tough-cookie": "~2.4.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.6",
-            "mime-types": "^2.1.12"
-          }
-        }
       }
     },
     "require-directory": {

package.json

@@ -8,6 +8,7 @@
     "start": "node ./index.js",
     "start-mon": "nodemon ./index.js",
     "migrate": "cd app && npx sequelize db:migrate",
+    "seed": "cd app && npx sequelize db:seed:all",
     "setup": "docker build -t marketalerts .  && docker run -e POSTGRES_USER=docker -e POSTGRES_PASSWORD=docker -e POSTGRES_DB=marketalerts --name pg_marketalerts -d -p 5432:5432 marketalerts && sleep 10 && npm run migrate",
     "docker-start": "docker start pg_marketalerts",
     "docker-stop": "docker stop pg_marketalerts",
@@ -39,7 +40,6 @@
     "express": "^4.16.4",
     "express-ejs-layouts": "^2.5.0",
     "express-layout": "^0.1.0",
-    "form-data": "^3.0.0",
     "html-to-text": "^5.1.1",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.26",