Merge pull request #460 from CodeForAfrica/chore/charterafrica_api_re…

…sources

@/charterafrica Move all documents API queries to /resources

apps/charterafrica/src/components/Documents/useDocuments.js

@@ -8,7 +8,7 @@ function useDocuments(q, options, pathname) {
   const qs = queryString({ ...options, q, pathname });
   const separator = qs ? "?" : "";
   const { data, error } = useSWR(
-    `/api/v1/opportunities/consultation/documents${separator}${qs}`,
+    `/api/v1/resources/documents${separator}${qs}`,
     fetcher
   );
 

apps/charterafrica/src/lib/data/common/processPageConsultation.js

@@ -126,8 +126,8 @@ async function processPageConsultation(page, api, context) {
       slug: "documents",
       title: documentsTitle ?? null,
     };
-    // SWR fallback
-    let swrKey = `/api/v1/opportunities/consultation/documents`;
+
+    let swrKey = `/api/v1/resources/documents`;
     const qs = queryString(documentsQuery);
     if (qs) {
       swrKey = `${swrKey}?${qs}`;
@@ -157,7 +157,7 @@ async function processPageConsultation(page, api, context) {
       );
     }
     blocks[playlistIndex] = {
-      slug: "embedded-playlist",
+      ...blocks[playlistIndex],
       config: {
         mostRecentText: "Most Recent",
         relevanceText: "Relevance",
@@ -172,6 +172,7 @@ async function processPageConsultation(page, api, context) {
         ...playlistField,
         items,
       },
+      slug: "embedded-playlist",
       title: title ?? null,
     };
   }

apps/charterafrica/src/lib/data/common/processPageDatasets.js

@@ -79,7 +79,7 @@ export default async function processPageDatasets(page, api, context) {
     }
     // eslint-disable-next-line no-param-reassign
     page.fallback = {
-      [`${swrKey}`]: datasets,
+      [swrKey]: datasets,
     };
   }
 

apps/charterafrica/src/lib/data/common/processPageDocuments.js

@@ -87,14 +87,14 @@ export default async function processPageDocuments(page, api, context) {
       pathname: pageUrl,
     };
 
-    let swrKey = `/api/v1/resources/datasets`;
+    let swrKey = `/api/v1/resources/documents`;
     const qs = queryString(documentsQuery);
     if (qs) {
       swrKey = `${swrKey}?${qs}`;
     }
     // eslint-disable-next-line no-param-reassign
     page.fallback = {
-      [`${swrKey}`]: documents,
+      [swrKey]: documents,
     };
   }
 

apps/charterafrica/src/pages/api/v1/opportunities/consultation/[media].page.js

@@ -1,39 +1,28 @@
-import { fetchDocuments } from "@/charterafrica/lib/sourceAfrica";
-import { fetchResource } from "@/charterafrica/lib/youtube";
+import * as Sentry from "@sentry/nextjs";
 
-const documents = async (req, res) => {
-  const { q, media, pathname, ...rest } = req.query;
+import { fetchResource } from "@/charterafrica/lib/youtube";
 
-  try {
-    const data = await fetchDocuments(q, pathname, rest);
-    return res.status(200).json(data);
-  } catch (error) {
-    return res.status(500).json({ error });
-  }
-};
+async function multimedia(req, res) {
+  const { pathname, ...rest } = req.query;
 
-const multimedia = async (req, res) => {
-  try {
-    const { pathname, ...rest } = req.query;
-    const data = await fetchResource(pathname, rest);
-    return res.status(200).json(data);
-  } catch (error) {
-    return res.status(500).json(error);
-  }
-};
+  const data = await fetchResource(pathname, rest);
+  return res.status(200).json(data);
+}
 
-const mediaMap = {
-  documents,
+const fetchMediaMap = {
   multimedia,
 };
 
 export default async function handler(req, res) {
-  const {
-    query: { media },
-  } = req;
-  const response = mediaMap[media];
-  if (response) {
-    return response(req, res);
+  const { media } = req.query;
+  const fetchMedia = fetchMediaMap[media];
+  if (fetchMedia) {
+    try {
+      return fetchMedia(req, res);
+    } catch (err) {
+      Sentry.captureException(err);
+      return res.status(500).json(err);
+    }
   }
   return res.status(404).json({ message: "UNKNOWN_MEDIA", media });
 }

apps/charterafrica/src/pages/api/v1/resources/[type].page.js

@@ -0,0 +1,54 @@
+import * as Sentry from "@sentry/nextjs";
+
+import fetchDatasets from "@/charterafrica/lib/openAfrica";
+import { fetchDocuments } from "@/charterafrica/lib/sourceAfrica";
+
+async function datasets(req, res) {
+  const {
+    sort = "metadata_created desc",
+    tags,
+    countries,
+    q = "",
+    page = 1,
+    pathname,
+    locale,
+    organizationId,
+  } = req.query;
+
+  const data = await fetchDatasets(organizationId, pathname, {
+    q,
+    page,
+    sort,
+    tags: tags?.split(","),
+    countries: countries?.split(","),
+    locale,
+  });
+  return res.status(200).json(data);
+}
+
+async function documents(req, res) {
+  const { q, pathname, ...rest } = req.query;
+
+  const data = await fetchDocuments(q, pathname, rest);
+  return res.status(200).json(data);
+}
+
+const fetchResourcesByType = {
+  datasets,
+  documents,
+};
+
+export default async function handler(req, res) {
+  const { type } = req.query;
+
+  const fetchResources = fetchResourcesByType[type];
+  if (fetchResources) {
+    try {
+      return fetchResources(req, res);
+    } catch (err) {
+      Sentry.captureException(err);
+      return res.status(500).json(err);
+    }
+  }
+  return res.status(404).json({ message: "UNKNOWN_TYPE", type });
+}