chore: move setQueryOptions to utils/query

Author: simonc56

apps/frontend/src/hooks/useFetchProviderNews.ts

@@ -1,5 +1,5 @@
 import { useGetAllNewsByProviderQuery } from 'src/features/news';
-import { setQueryOptions } from './useFetchSortedNews';
+import { setQueryOptions } from 'src/utils/query';
 
 export default function useFetchProviderNews({
   providerId,

apps/frontend/src/hooks/useFetchSortedNews.ts

@@ -1,45 +1,5 @@
-import { useAppSelector } from 'src/app/hooks';
 import { useGetSortedNewsQuery } from 'src/features/news';
-
-type NewsQueryOptions = {
-  providerId?: string | undefined;
-  begin?: string;
-  end?: string;
-  filter?: string;
-  limit?: number;
-};
-
-export const setQueryOptions = (
-  providerId: string | undefined,
-): NewsQueryOptions => {
-  const date = useAppSelector((state) => state.settings.date);
-  const options: NewsQueryOptions = {};
-  if (providerId) {
-    options.providerId = providerId;
-  }
-  // utilisation de setHours pour gérer les problèmes de fuseau horaire
-  if (date === 'today') {
-    const todayBegin = new Date(new Date().setHours(0, 0, 0, 0));
-    options.begin = todayBegin.toISOString();
-  }
-  if (date === 'yesterday') {
-    const yesterdayBegin = new Date(
-      new Date().setDate(new Date().getDate() - 1),
-    );
-    yesterdayBegin.setHours(23, 59, 59, 999);
-    const yesterdayEnd = new Date(new Date().setDate(new Date().getDate() - 1));
-    yesterdayEnd.setHours(0, 0, 0, 0);
-    options.begin = yesterdayBegin.toISOString();
-    options.end = yesterdayEnd.toISOString();
-  }
-  if (date === 'last-week') {
-    const lastWeek = new Date();
-    lastWeek.setDate(lastWeek.getDate() - 7);
-    lastWeek.setHours(0, 0, 0, 0);
-    options.begin = lastWeek.toISOString();
-  }
-  return options;
-};
+import { setQueryOptions } from 'src/utils/query';
 
 export default function useFetchSortedNews() {
   // const [searchParams] = useSearchParams();

apps/frontend/src/utils/query.ts

@@ -0,0 +1,43 @@
+import { useAppSelector } from 'src/app/hooks';
+
+type NewsQueryOptions = {
+  providerId?: string | undefined;
+  begin?: string;
+  end?: string;
+  filter?: string;
+  limit?: number;
+};
+
+export const setQueryOptions = (
+  providerId: string | undefined,
+): NewsQueryOptions => {
+  const date = useAppSelector((state) => state.settings.date);
+  const options: NewsQueryOptions = {};
+  if (providerId) {
+    options.providerId = providerId;
+  }
+  // utilisation de setHours pour gérer les problèmes de fuseau horaire
+  if (date === 'today') {
+    const todayBegin = new Date(new Date().setHours(0, 0, 0, 0));
+    options.begin = todayBegin.toISOString();
+  }
+  if (date === 'yesterday') {
+    const yesterdayBegin = new Date(
+      new Date().setDate(new Date().getDate() - 1),
+    );
+    yesterdayBegin.setHours(0, 0, 0, 0);
+    const yesterdayEnd = new Date(new Date().setDate(new Date().getDate() - 1));
+    yesterdayEnd.setHours(23, 59, 59, 999);
+    console.log('yesterdayEnd', yesterdayEnd);
+    options.begin = yesterdayBegin.toISOString();
+    options.end = yesterdayEnd.toISOString();
+  }
+  if (date === 'last-week') {
+    const lastWeek = new Date();
+    lastWeek.setDate(lastWeek.getDate() - 7);
+    lastWeek.setHours(0, 0, 0, 0);
+    options.begin = lastWeek.toISOString();
+  }
+  console.log(options);
+  return options;
+};