Use react query getQueryData method instead of regular fetch

Co-authored-by: mab <[email protected]>
GeotrekCE · Jul 16, 2024 · bcd0134 · bcd0134
1 parent 01cfc84
commit bcd0134
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 86 deletions.
diff --git a/frontend/src/pages/event/[touristicEvent].tsx b/frontend/src/pages/event/[touristicEvent].tsx
@@ -7,6 +7,7 @@ import { routes } from 'services/routes';
 import { redirectIfWrongUrl } from 'modules/utils/url';
 import { getCommonDictionaries } from 'modules/dictionaries/connector';
 import { isRessourceMissing } from 'services/routeUtils';
+import { TouristicEventDetails } from 'modules/touristicEvent/interface';
 import { getTouristicEventDetails } from '../../modules/touristicEvent/connector';
 import { isUrlString } from '../../modules/utils/string';
 import Custom404 from '../404';
@@ -32,22 +33,25 @@ export const getServerSideProps: GetServerSideProps = async context => {
       queryFn: () => getCommonDictionaries(locale),
     });
 
-    const details = await getTouristicEventDetails(id, locale, commonDictionaries);
     await queryClient.prefetchQuery({
       queryKey: ['touristicEventDetails', id, locale],
-      queryFn: () => details,
+      queryFn: () => getTouristicEventDetails(id, locale, commonDictionaries),
     });
+
+    const details = queryClient.getQueryData<TouristicEventDetails>(['touristicEventDetails', id, locale]);
 
-    const redirect = redirectIfWrongUrl(
-      id,
-      details.name,
-      { ...context, locale },
-      routes.TOURISTIC_EVENT,
-    );
-    if (redirect)
-      return {
-        redirect,
-      };
+    if (details !== undefined) {
+      const redirect = redirectIfWrongUrl(
+        id,
+        details.name,
+        { ...context, locale },
+        routes.TOURISTIC_EVENT,
+      );
+      if (redirect)
+        return {
+      redirect,
+    };
+  }
 
     return {
       props: {

diff --git a/frontend/src/pages/information/[flatPage].tsx b/frontend/src/pages/information/[flatPage].tsx
@@ -10,6 +10,7 @@ import { getSuggestionsFromContent } from 'modules/flatpage/utils';
 import { isUrlString } from 'modules/utils/string';
 import { redirectIfWrongUrl } from 'modules/utils/url';
 import { isRessourceMissing } from 'services/routeUtils';
+import { FlatPageDetails } from 'modules/flatpage/interface';
 import Custom404 from '../404';
 
 export const getServerSideProps: GetServerSideProps = async context => {
@@ -32,33 +33,36 @@ export const getServerSideProps: GetServerSideProps = async context => {
       queryFn: () => getCommonDictionaries(locale),
     });
 
-    const details = await getFlatPageDetails(id, locale, commonDictionaries);
     await queryClient.prefetchQuery({
       queryKey: ['flatPageDetails', id, locale],
-      queryFn: () => details,
+      queryFn: () => getFlatPageDetails(id, locale, commonDictionaries),
     });
 
-    const suggestions = getSuggestionsFromContent(details.content);
+    const details = queryClient.getQueryData<FlatPageDetails>(['flatPageDetails', id, locale]);
 
-    const activitySuggestionIds = suggestions.flatMap(suggestion =>
-      'ids' in suggestion ? suggestion.ids : [suggestion.type],
-    );
+    if (details !== undefined) {
+      const suggestions = getSuggestionsFromContent(details.content);
 
-    await queryClient.prefetchQuery({
-      queryKey: ['activitySuggestions', ...activitySuggestionIds, id, locale],
-      queryFn: () => getActivitySuggestions(suggestions, locale, commonDictionaries),
-    });
+      const activitySuggestionIds = suggestions.flatMap(suggestion =>
+        'ids' in suggestion ? suggestion.ids : [suggestion.type],
+      );
+
+      await queryClient.prefetchQuery({
+        queryKey: ['activitySuggestions', ...activitySuggestionIds, id, locale],
+        queryFn: () => getActivitySuggestions(suggestions, locale, commonDictionaries),
+      });
 
-    const redirect = redirectIfWrongUrl(
-      id,
-      details.title,
-      { ...context, locale },
-      routes.FLAT_PAGE,
-    );
-    if (redirect)
-      return {
-        redirect,
-      };
+      const redirect = redirectIfWrongUrl(
+        id,
+        details.title,
+        { ...context, locale },
+        routes.FLAT_PAGE,
+      );
+      if (redirect)
+        return {
+          redirect,
+        };
+    }
 
     return {
       props: {

diff --git a/frontend/src/pages/outdoor-course/[outdoorCourse].tsx b/frontend/src/pages/outdoor-course/[outdoorCourse].tsx
@@ -7,8 +7,9 @@ import { routes } from 'services/routes';
 import { redirectIfWrongUrl } from 'modules/utils/url';
 import { getCommonDictionaries } from 'modules/dictionaries/connector';
 import { isRessourceMissing } from 'services/routeUtils';
-import { getOutdoorCourseDetails } from '../../modules/outdoorCourse/connector';
-import { isUrlString } from '../../modules/utils/string';
+import { OutdoorCourseDetails } from 'modules/outdoorCourse/interface';
+import { getOutdoorCourseDetails } from 'modules/outdoorCourse/connector';
+import { isUrlString } from 'modules/utils/string';
 import Custom404 from '../404';
 
 export const getServerSideProps: GetServerSideProps = async context => {
@@ -33,22 +34,24 @@ export const getServerSideProps: GetServerSideProps = async context => {
       queryFn: () => getCommonDictionaries(locale),
     });
 
-    const details = await getOutdoorCourseDetails(id, locale, commonDictionaries);
     await queryClient.prefetchQuery({
       queryKey: ['outdoorCourseDetails', id, locale],
-      queryFn: () => details,
+      queryFn: () => getOutdoorCourseDetails(id, locale, commonDictionaries),
     });
+    const details = queryClient.getQueryData<OutdoorCourseDetails>(['outdoorCourseDetails', id, locale]) ;
 
-    const redirect = redirectIfWrongUrl(
-      id,
-      details.name,
-      { ...context, locale },
-      routes.OUTDOOR_COURSE,
-    );
-    if (redirect)
-      return {
+    if (details !==undefined) {
+        const redirect = redirectIfWrongUrl(
+          id,
+          details.name,
+          { ...context, locale },
+          routes.OUTDOOR_COURSE,
+        );
+        if (redirect)
+          return {
         redirect,
       };
+    }
 
     return {
       props: {

diff --git a/frontend/src/pages/outdoor-site/[outdoorSite].tsx b/frontend/src/pages/outdoor-site/[outdoorSite].tsx
@@ -6,9 +6,10 @@ import { dehydrate, QueryCache, QueryClient } from '@tanstack/react-query';
 import { routes } from 'services/routes';
 import { getCommonDictionaries } from 'modules/dictionaries/connector';
 import { isRessourceMissing } from 'services/routeUtils';
-import { getOutdoorSiteDetails } from '../../modules/outdoorSite/connector';
-import { isUrlString } from '../../modules/utils/string';
-import { redirectIfWrongUrl } from '../../modules/utils/url';
+import { OutdoorSiteDetails } from 'modules/outdoorSite/interface';
+import { getOutdoorSiteDetails } from 'modules/outdoorSite/connector';
+import { isUrlString } from 'modules/utils/string';
+import { redirectIfWrongUrl } from 'modules/utils/url';
 import Custom404 from '../404';
 
 export const getServerSideProps: GetServerSideProps = async context => {
@@ -31,22 +32,25 @@ export const getServerSideProps: GetServerSideProps = async context => {
       queryFn: () => getCommonDictionaries(locale),
     });
 
-    const details = await getOutdoorSiteDetails(id, locale, commonDictionaries);
     await queryClient.prefetchQuery({
       queryKey: ['outdoorSiteDetails', id, locale],
-      queryFn: () => details,
+      queryFn: () => getOutdoorSiteDetails(id, locale, commonDictionaries),
     });
+
+    const details = queryClient.getQueryData<OutdoorSiteDetails>(['outdoorSiteDetails', id, locale]);
 
-    const redirect = redirectIfWrongUrl(
-      id,
-      details.name,
-      { ...context, locale },
-      routes.OUTDOOR_SITE,
-    );
-    if (redirect)
-      return {
+    if (details !== undefined) {
+      const redirect = redirectIfWrongUrl(
+          id,
+          details.name,
+          { ...context, locale },
+          routes.OUTDOOR_SITE,
+        );
+        if (redirect)
+          return {
         redirect,
       };
+    }
 
     return {
       props: {

diff --git a/frontend/src/pages/service/[touristicContent].tsx b/frontend/src/pages/service/[touristicContent].tsx
@@ -6,9 +6,10 @@ import { dehydrate, QueryCache, QueryClient } from '@tanstack/react-query';
 import { routes } from 'services/routes';
 import { getCommonDictionaries } from 'modules/dictionaries/connector';
 import { isRessourceMissing } from 'services/routeUtils';
-import { getTouristicContentDetails } from '../../modules/touristicContent/connector';
-import { isUrlString } from '../../modules/utils/string';
-import { redirectIfWrongUrl } from '../../modules/utils/url';
+import { TouristicContentDetails } from 'modules/touristicContent/interface';
+import { getTouristicContentDetails } from 'modules/touristicContent/connector';
+import { isUrlString } from 'modules/utils/string';
+import { redirectIfWrongUrl } from 'modules/utils/url';
 import Custom404 from '../404';
 
 export const getServerSideProps: GetServerSideProps = async context => {
@@ -33,22 +34,28 @@ export const getServerSideProps: GetServerSideProps = async context => {
       queryFn: () => getCommonDictionaries(locale),
     });
 
-    const details = await getTouristicContentDetails(id, locale, commonDictionaries);
     await queryClient.prefetchQuery({
       queryKey: ['touristicContentDetails', id, locale],
-      queryFn: () => details,
+      queryFn: () => getTouristicContentDetails(id, locale, commonDictionaries),
     });
-
-    const redirect = redirectIfWrongUrl(
+    const details = queryClient.getQueryData<TouristicContentDetails>([
+      'touristicContentDetails',
       id,
-      details.name,
-      { ...context, locale },
-      routes.TOURISTIC_CONTENT,
-    );
-    if (redirect)
-      return {
-        redirect,
-      };
+      locale,
+    ]);
+
+    if (details !== undefined) {
+      const redirect = redirectIfWrongUrl(
+        id,
+        details.name,
+        { ...context, locale },
+        routes.TOURISTIC_CONTENT,
+      );
+      if (redirect)
+        return {
+          redirect,
+        };
+    }
 
     return {
       props: {

diff --git a/frontend/src/pages/trek/[slug].tsx b/frontend/src/pages/trek/[slug].tsx
@@ -9,7 +9,8 @@ import { getDefaultLanguage } from 'modules/header/utills';
 import { routes } from 'services/routes';
 import { getCommonDictionaries } from 'modules/dictionaries/connector';
 import { isRessourceMissing } from 'services/routeUtils';
-import { redirectIfWrongUrl } from '../../modules/utils/url';
+import { Details } from 'modules/details/interface';
+import { redirectIfWrongUrl } from 'modules/utils/url';
 import Custom404 from '../404';
 
 export const getServerSideProps: GetServerSideProps = async context => {
@@ -33,25 +34,29 @@ export const getServerSideProps: GetServerSideProps = async context => {
       queryFn: () => getCommonDictionaries(locale),
     });
 
-    const details = await getDetails(id, locale, commonDictionaries);
+    await queryClient.prefetchQuery({ queryKey: ['details', id, locale], queryFn: () => getDetails(id, locale, commonDictionaries) });
+
+    const details = queryClient.getQueryData<Details>(['details', id, locale]);
 
-    await queryClient.prefetchQuery({ queryKey: ['details', id, locale], queryFn: () => details });
     await queryClient.prefetchQuery({
       queryKey: ['trekFamily', parentIdString, locale],
       queryFn: () => getTrekFamily(parentIdString, locale),
     });
 
-    const redirect = redirectIfWrongUrl(
-      id,
-      details.title,
-      { ...context, locale },
-      routes.TREK,
-      Number(parentIdString),
-    );
-    if (redirect)
-      return {
-        redirect,
-      };
+    if (details !== undefined) {
+
+      const redirect = redirectIfWrongUrl(
+        id,
+        details.title,
+        { ...context, locale },
+        routes.TREK,
+        Number(parentIdString),
+      );
+      if (redirect)
+        return {
+      redirect,
+    };
+  }
 
     return {
       props: {