Merge pull request #1 from hackforla/develop

Merge hackforla updates

.eslintrc.js

@@ -16,4 +16,12 @@ module.exports = {
   rules: {
     "prettier/prettier": "error",
   },
+  settings: {
+    react: {
+      // Version checking of react. Default is "detect", which
+      // fails at the root directory, since react is not installed
+      // here. Providing a dummy number supresses the warning
+      version: "16.0",
+    },
+  },
 };

app/services/account-service.js

@@ -402,7 +402,7 @@ const setPermissions = async (userId, permissionName, value) => {
   try {
     // do a tiny bit of sanity checking on our input
     var booleanValue = Boolean(value);
-    const updateSql = `update login set ${permissionName}=$1} where id = ${userId};`;
+    const updateSql = `update login set ${permissionName}=$1 where id = ${userId};`;
     await pool.query(updateSql, [booleanValue]);
     return {
       success: true,

app/services/stakeholder-best-service.js

@@ -12,6 +12,9 @@ record has been approved, it will be the most recent version (i.e., have
 If you make changes to the database structure, be sure to update these
 methods as well as the corresponding methods in the stakeholder-service.js.
 
+You can search by max/min lat, lng bounds or by a center and radius(distance),
+with bounds taking precedence.
+
 */
 
 const booleanEitherClause = (columnName, value) => {
@@ -27,13 +30,16 @@ const search = async ({
   latitude,
   longitude,
   distance,
+  maxLat,
+  maxLng,
+  minLat,
+  minLng,
   isInactive,
   verificationStatusId,
   tenantId,
 }) => {
   const locationClause = buildLocationClause(latitude, longitude);
   const categoryClause = buildCTEClause(categoryIds, "");
-
   const sql = `${categoryClause}
     select s.id, s.name, s.address_1, s.address_2, s.city, s.state, s.zip,
     s.phone, s.latitude, s.longitude, s.website,  s.notes,
@@ -62,16 +68,20 @@ const search = async ({
     s.donation_delivery_instructions, s.donation_notes, s.covid_notes,
     s.category_notes, s.eligibility_notes, s.food_types, s.languages,
     s.v_name, s.v_categories, s.v_address, s.v_phone, s.v_email,
-    s.v_hours, s.verification_status_id, s.inactive_temporary,
+    s.v_hours, s.v_food_types, s.verification_status_id, s.inactive_temporary,
     array_to_json(s.hours) as hours, s.category_ids,
     s.neighborhood_id, s.is_verified,
+    s.food_bakery, s.food_dry_goods, s.food_produce,
+    s.food_dairy, s.food_prepared, s.food_meat,
     ${locationClause ? `${locationClause} AS distance,` : ""}
     ${buildLoginSelectsClause()}
     from stakeholder_set as s
     ${buildLoginJoinsClause()}
-    where s.tenant_id = ${tenantId} 
+    where s.tenant_id = ${tenantId}
     ${
-      Number(distance) && locationClause
+      maxLat && maxLng && minLat && minLng
+        ? buildBounds({ maxLat, maxLng, minLat, minLng })
+        : Number(distance) && locationClause
         ? `AND ${locationClause} < ${distance}`
         : ""
     }
@@ -83,7 +93,6 @@ const search = async ({
     }
     order by distance
   `;
-  // console.log(sql);
   let stakeholders = [];
   let categoriesResults = [];
   var stakeholderResult, stakeholder_ids;
@@ -173,6 +182,12 @@ const search = async ({
       covidNotes: row.covid_notes || "",
       categoryNotes: row.category_notes || "",
       eligibilityNotes: row.eligibility_notes || "",
+      foodBakery: row.food_bakery,
+      foodDryGoods: row.food_dry_goods,
+      foodProduce: row.food_produce,
+      foodDairy: row.food_dairy,
+      foodPrepared: row.food_prepared,
+      foodMeat: row.food_meat,
       foodTypes: row.food_types || "",
       languages: row.languages || "",
       confirmedName: row.v_name,
@@ -181,6 +196,7 @@ const search = async ({
       confirmedPhone: row.v_phone,
       confirmedEmail: row.v_email,
       confirmedHours: row.v_hours,
+      confirmedFoodTypes: row.v_food_types,
       verificationStatusId: row.verification_status_id,
       inactiveTemporary: row.inactive_temporary,
       neighborhoodId: row.neighborhood_id,
@@ -224,8 +240,10 @@ const selectById = async (id) => {
       s.donation_delivery_instructions, s.donation_notes, s.covid_notes,
       s.category_notes, s.eligibility_notes, s.food_types, s.languages,
       s.v_name, s.v_categories, s.v_address, s.v_phone, s.v_email,
-      s.v_hours, s.verification_status_id, s.inactive_temporary,
+      s.v_hours, s.v_food_types, s.verification_status_id, s.inactive_temporary,
       s.neighborhood_id, s.is_verified,
+      s.food_bakery, s.food_dry_goods, s.food_produce,
+      s.food_dairy, s.food_prepared, s.food_meat,
       ${buildLoginSelectsClause()}
     from stakeholder_best s
     ${buildLoginJoinsClause()}
@@ -296,6 +314,12 @@ const selectById = async (id) => {
     covidNotes: row.covid_notes || "",
     categoryNotes: row.category_notes || "",
     eligibilityNotes: row.eligibility_notes || "",
+    foodBakery: row.food_bakery,
+    foodDryGoods: row.food_dry_goods,
+    foodProduce: row.food_produce,
+    foodDairy: row.food_dairy,
+    foodPrepared: row.food_prepared,
+    foodMeat: row.food_meat,
     foodTypes: row.food_types || "",
     languages: row.languages || "",
     confirmedName: row.v_name,
@@ -304,6 +328,7 @@ const selectById = async (id) => {
     confirmedPhone: row.v_phone,
     confirmedEmail: row.v_email,
     confirmedHours: row.v_hours,
+    confirmedFoodTypes: row.v_food_types,
     verificationStatusId: row.verification_status_id,
     inactiveTemporary: row.inactive_temporary,
     neighborhoodId: row.neighborhood_id,
@@ -349,6 +374,13 @@ const buildLocationClause = (latitude, longitude) => {
   return locationClause;
 };
 
+const buildBounds = ({ maxLat, maxLng, minLat, minLng }) => {
+  return `
+    AND s.latitude BETWEEN ${minLat} AND ${maxLat}
+    AND s.longitude BETWEEN ${minLng} AND ${maxLng}
+  `;
+};
+
 const buildLoginJoinsClause = () => {
   return `
     left join login L1 on s.created_login_id = L1.id

app/services/stakeholder-log-service.js

@@ -31,8 +31,10 @@ const selectById = async (id) => {
       s.donation_delivery_instructions, s.donation_notes, s.covid_notes,
       s.category_notes, s.eligibility_notes, s.food_types, s.languages,
       s.v_name, s.v_categories, s.v_address, s.v_phone, s.v_email,
-      s.v_hours, s.verification_status_id, s.inactive_temporary,
+      s.v_hours, s.v_food_types, s.verification_status_id, s.inactive_temporary,
       s.neighborhood_id, 
+      s.food_bakery, s.food_dry_goods, s.food_produce,
+      s.food_dairy, s.food_prepared, s.food_meat,
       ${buildLoginSelectsClause()}
     from stakeholder_log s
     ${buildLoginJoinsClause()}
@@ -107,11 +109,18 @@ const selectById = async (id) => {
       confirmedPhone: row.v_phone,
       confirmedEmail: row.v_email,
       confirmedHours: row.v_hours,
+      confirmedFoodTypes: row.v_food_types,
       verificationStatusId: row.verification_status_id,
       inactiveTemporary: row.inactive_temporary,
       neighborhoodId: row.neighborhood_id,
       neighborhoodName: row.neighborhood_name,
       completeCriticalPercent: row.complete_critical_percent,
+      foodBakery: row.food_bakery,
+      foodDryGoods: row.food_dry_goods,
+      foodProduce: row.food_produce,
+      foodDairy: row.food_dairy,
+      foodPrepared: row.food_prepared,
+      foodMeat: row.food_meat,
     });
   });