feat filter panel custom hour any (#2547)

* feat-filter-panel-custom-hour-any

* remove dup lines

* refactor to work with DB’s HH:mm:ss format, instead rely on getNextDateForDay.

* refactor

Author: junjun107

client/src/components/FoodSeeker/SearchResults/ResultsFilters/FilterPanel.jsx

@@ -345,6 +345,7 @@ const OPEN_TIME_DROPDOWNS = {
   time: {
     placeholder: "Open Time",
     labels: [
+      "Any",
       "12:00AM",
       "01:00AM",
       "02:00AM",

client/src/helpers/index.js

@@ -221,28 +221,31 @@ export const getNextDateForDay = (dayInput, timeInput, targetTimezone) => {
   const dayMap = { SUN: 0, MON: 1, TUE: 2, WED: 3, THU: 4, FRI: 5, SAT: 6 };
   const targetDay = dayMap[dayInput.toUpperCase()];
 
-  // Parse the input time
-  let time = dayjs(timeInput, "hh:mmA");
+  if (timeInput === "Any") {
+    let currentDate = dayjs().tz(targetTimezone);
+    let currentDay = currentDate.day();
+
+    let dayDifference = targetDay - currentDay;
+    if (dayDifference < 0) dayDifference += 7;
+
+    return currentDate.add(dayDifference, "day").startOf("day");
+  }
 
-  // Get the current date and time in the target timezone
+  let time = dayjs(timeInput, "hh:mmA");
   let currentDate = dayjs().tz(targetTimezone);
   let currentDay = currentDate.day();
 
-  // Calculate the difference in days
   let dayDifference = targetDay - currentDay;
   if (dayDifference < 0) dayDifference += 7;
   if (dayDifference === 0 && currentDate.hour() > time.hour()) {
     dayDifference += 7;
   }
 
-  // Set the target date and time
-  let targetDate = currentDate
+  return currentDate
     .add(dayDifference, "day")
     .set("hour", time.hour())
     .set("minute", time.minute())
     .set("second", 0);
-
-  return targetDate;
 };
 
 export const getDayTimeNow = () => {

client/src/hooks/useOrganizationBests.js

@@ -13,6 +13,7 @@ import {
 import { stakeholdersDaysHours } from "../components/FoodSeeker/SearchResults/StakeholderPreview/StakeholderPreview";
 import * as analytics from "../services/analytics";
 import * as stakeholderService from "../services/stakeholder-best-service";
+import dayjs from "dayjs";
 
 const sortOrganizations = (a, b) => {
   if (
@@ -71,23 +72,35 @@ export default function useOrganizationBests() {
       }
 
       if (filters.showActiveOnly) {
-        // filter out inactive, inactiveTemporary stakeholders
         filteredStakeholders = filteredStakeholders.filter((stakeholder) => {
           return !stakeholder.inactive && !stakeholder.inactiveTemporary;
         });
       }
 
       const { day, time } = filters.openTimeFilter;
-      if (day !== "" && time !== "") {
+      if (day || (time && time !== "Any")) {
         filteredStakeholders = filteredStakeholders.filter((stakeholder) => {
-          const nextDateForDay = getNextDateForDay(day, time, tenantTimeZone);
-          const hours = stakeholdersDaysHours(
-            stakeholder,
-            tenantTimeZone,
-            nextDateForDay
-          );
-
-          return !!hours;
+          return stakeholder.hours?.some((h) => {
+            const dayMatch = day ? h.day_of_week.toUpperCase() === day : true;
+
+            const timeMatch =
+              !time || time === "Any"
+                ? true
+                : (() => {
+                    const openTime = dayjs(h.open, "HH:mm:ss");
+                    const closeTime = dayjs(h.close, "HH:mm:ss");
+                    const filterTime = dayjs(time, "hh:mmA");
+
+                    return (
+                      filterTime.isSame(openTime) ||
+                      filterTime.isSame(closeTime) ||
+                      (filterTime.isAfter(openTime) &&
+                        filterTime.isBefore(closeTime))
+                    );
+                  })();
+
+            return dayMatch && timeMatch;
+          });
         });
       }
       if (filters.orgNameFilter) {