Allow other packages and apps to use the collection store

ducksmanager · Oct 19, 2023 · 0837e0e · 0837e0e
1 parent a7c95c0
commit 0837e0e
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 41 deletions.
diff --git a/apps/web/index.ts b/apps/web/index.ts
@@ -5,8 +5,10 @@ export {
 } from "./src/api";
 import { bookcase } from "./src/stores/bookcase";
 import { coa } from "./src/stores/coa";
+import { collection } from "./src/stores/collection";
 export const stores = {
   coa,
+  collection,
   bookcase,
 };
 

diff --git a/apps/web/src/App.vue b/apps/web/src/App.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script setup lang="ts">
+import axios from "axios";
 import { buildWebStorage } from "axios-cache-interceptor";
 
 import { coa } from "~/stores/coa";
@@ -13,6 +14,11 @@ import { createCachedCoaApi } from "./api";
 collection().loadUser();
 
 onBeforeMount(() => {
+  collection().setApi(
+    axios.create({
+      baseURL: import.meta.env.VITE_GATEWAY_URL,
+    }),
+  );
   coa().setApi(
     createCachedCoaApi(
       buildWebStorage(sessionStorage),

diff --git a/apps/web/src/components/ShortStats.vue b/apps/web/src/components/ShortStats.vue
@@ -40,7 +40,3 @@ const totalPerPublication = $computed(
 
 const { t } = useI18n();
 </script>
-
-<style scoped>
-
-</style>
diff --git a/apps/web/src/stores/coa.ts b/apps/web/src/stores/coa.ts
@@ -50,13 +50,12 @@ const addPartInfo = (issueDetails: InducksIssueDetails) => {
   };
 };
 
-let coaApi: AxiosInstance;
-
-export const ISSUECODE_REGEX =
-  /^(?<countrycode>[^/]+)\/(?<magazinecode>[^ ]+) (?<issuenumber>.+)/;
+let api: AxiosInstance;
 
 export const coa = defineStore("coa", () => {
-  const locale = useI18n().locale,
+  const ISSUECODE_REGEX =
+      /^(?<countrycode>[^/]+)\/(?<magazinecode>[^ ]+) (?<issuenumber>.+)/,
+    locale = useI18n().locale,
     coverUrls = ref({} as { [issuenumber: string]: string }),
     countryNames = ref(null as { [countrycode: string]: string } | null),
     publicationNames = ref({} as POST__coa__list__publications["resBody"]),
@@ -142,7 +141,7 @@ export const coa = defineStore("coa", () => {
         isLoadingCountryNames.value = true;
         countryNames.value = (
           await call(
-            coaApi,
+            api,
             new GET__coa__list__countries__$locale({
               query: { countryCodes: null },
               params: {
@@ -168,7 +167,7 @@ export const coa = defineStore("coa", () => {
         addPublicationNames(
           (
             await call(
-              coaApi,
+              api,
               new POST__coa__list__publications({
                 reqBody: { publicationCodes: actualNewPublicationCodes },
               }),
@@ -194,7 +193,7 @@ export const coa = defineStore("coa", () => {
           await getChunkedRequests<GET__coa__quotations__publications>({
             callFn: (chunk) =>
               call(
-                coaApi,
+                api,
                 new GET__coa__quotations__publications({
                   query: { publicationCodes: chunk },
                 }),
@@ -220,7 +219,7 @@ export const coa = defineStore("coa", () => {
       if (publicationNamesFullCountries.value.includes(countrycode)) return;
 
       return call(
-        coaApi,
+        api,
         new GET__coa__list__publications__$countrycode({
           params: { countrycode },
         }),
@@ -251,7 +250,7 @@ export const coa = defineStore("coa", () => {
           ...(await getChunkedRequests<GET__coa__authorsfullnames__$authors>({
             callFn: (chunk) =>
               call(
-                coaApi,
+                api,
                 new GET__coa__authorsfullnames__$authors({
                   params: { authors: chunk },
                 }),
@@ -265,7 +264,7 @@ export const coa = defineStore("coa", () => {
     fetchIssueNumbersWithTitles = async (publicationcode: string) => {
       issuesWithTitles.value[publicationcode] = (
         await call(
-          coaApi,
+          api,
           new GET__coa__list__issues__withTitle({
             query: { publicationcode },
           }),
@@ -287,7 +286,7 @@ export const coa = defineStore("coa", () => {
             {
               callFn: async (chunk) =>
                 call(
-                  coaApi,
+                  api,
                   new GET__coa__list__issues__by_publication_codes({
                     query: { publicationCodes: chunk },
                   }),
@@ -326,7 +325,7 @@ export const coa = defineStore("coa", () => {
           await getChunkedRequests<POST__coa__issues__decompose>({
             callFn: (chunk) =>
               call(
-                coaApi,
+                api,
                 new POST__coa__issues__decompose({
                   reqBody: { issueCodes: chunk },
                 }),
@@ -340,11 +339,11 @@ export const coa = defineStore("coa", () => {
     fetchIssueCounts = async () => {
       if (!issueCounts.value)
         issueCounts.value = (
-          await call(coaApi, new GET__coa__list__issues__count({}))
+          await call(api, new GET__coa__list__issues__count({}))
         ).data;
     },
     fetchRecentIssues = async () =>
-      (await call(coaApi, new GET__coa__list__issues__recent())).data,
+      (await call(api, new GET__coa__list__issues__recent())).data,
     fetchIssueUrls = async ({
       publicationcode,
       issuenumber,
@@ -356,7 +355,7 @@ export const coa = defineStore("coa", () => {
       if (!issueDetails.value[issueCode]) {
         const newIssueDetails = (
           await call(
-            coaApi,
+            api,
             new GET__coa__list__issues__details({
               query: { publicationcode, issuenumber },
             }),
@@ -371,7 +370,7 @@ export const coa = defineStore("coa", () => {
     };
   return {
     setApi: (apiInstance: AxiosInstance) => {
-      coaApi = apiInstance;
+      api = apiInstance;
     },
     coverUrls,
     countryNames,
@@ -403,5 +402,7 @@ export const coa = defineStore("coa", () => {
     fetchIssueCodesDetails,
     fetchIssueCounts,
     fetchIssueUrls,
+
+    ISSUECODE_REGEX,
   };
 });
diff --git a/apps/web/src/stores/collection.ts b/apps/web/src/stores/collection.ts
@@ -1,4 +1,4 @@
-import axios from "axios";
+import { AxiosInstance } from "axios";
 import Cookies from "js-cookie";
 import { defineStore } from "pinia";
 
@@ -74,6 +74,8 @@ export type QuotedIssue = {
   estimationGivenCondition: number;
 };
 
+let api: AxiosInstance;
+
 export const collection = defineStore("collection", () => {
   const collection = ref(null as IssueWithPublicationcode[] | null),
     watchedPublicationsWithSales = ref(null as string[] | null),
@@ -306,7 +308,7 @@ export const collection = defineStore("collection", () => {
     }),
     updateCollectionSingleIssue = async (data: CollectionUpdateSingleIssue) => {
       await call(
-        axios,
+        api,
         new POST__collection__issues__single({
           reqBody: data,
         }),
@@ -317,7 +319,7 @@ export const collection = defineStore("collection", () => {
       data: CollectionUpdateMultipleIssues,
     ) => {
       await call(
-        axios,
+        api,
         new POST__collection__issues__multiple({
           reqBody: data,
         }),
@@ -326,7 +328,7 @@ export const collection = defineStore("collection", () => {
     },
     createPurchase = async (date: string, description: string) => {
       await call(
-        axios,
+        api,
         new PUT__collection__purchases({
           reqBody: { date, description },
         }),
@@ -335,7 +337,7 @@ export const collection = defineStore("collection", () => {
     },
     deletePurchase = async (id: number) => {
       await call(
-        axios,
+        api,
         new DELETE__collection__purchases__$id({
           params: { id: String(id) },
         }),
@@ -349,15 +351,16 @@ export const collection = defineStore("collection", () => {
           collectionIssueNumber === issuenumber,
       ),
     loadPreviousVisit = async () => {
-      previousVisit.value = (
-        await call(axios, new POST__collection__lastvisit())
-      ).data?.previousVisit;
+      previousVisit.value = (await call(api, new POST__collection__lastvisit()))
+        .data?.previousVisit;
     },
     loadCollection = async (afterUpdate = false) => {
+      console.log("loadCollection");
+
       if (afterUpdate || (!isLoadingCollection.value && !collection.value)) {
         isLoadingCollection.value = true;
         collection.value = (
-          await call(axios, new GET__collection__issues())
+          await call(api, new GET__collection__issues())
         ).data.map((issue) => ({
           ...issue,
           publicationcode: `${issue.country}/${issue.magazine}`,
@@ -369,7 +372,7 @@ export const collection = defineStore("collection", () => {
       if (afterUpdate || (!isLoadingPurchases.value && !purchases.value)) {
         isLoadingPurchases.value = true;
         purchases.value = (
-          await call(axios, new GET__collection__purchases())
+          await call(api, new GET__collection__purchases())
         ).data;
         isLoadingPurchases.value = false;
       }
@@ -381,7 +384,7 @@ export const collection = defineStore("collection", () => {
       ) {
         isLoadingWatchedAuthors.value = true;
         watchedAuthors.value = (
-          await call(axios, new GET__collection__authors__watched())
+          await call(api, new GET__collection__authors__watched())
         ).data;
         isLoadingWatchedAuthors.value = false;
       }
@@ -395,7 +398,7 @@ export const collection = defineStore("collection", () => {
         isLoadingWatchedPublicationsWithSales.value = true;
         watchedPublicationsWithSales.value = (
           await call(
-            axios,
+            api,
             new GET__collection__options__$optionName({
               params: {
                 optionName: "sales_notification_publications",
@@ -415,7 +418,7 @@ export const collection = defineStore("collection", () => {
         isLoadingMarketplaceContactMethods.value = true;
         marketplaceContactMethods.value = (
           await call(
-            axios,
+            api,
             new GET__collection__options__$optionName({
               params: { optionName: "marketplace_contact_methods" },
             }),
@@ -426,7 +429,7 @@ export const collection = defineStore("collection", () => {
     },
     updateMarketplaceContactMethods = async () =>
       await call(
-        axios,
+        api,
         new POST__collection__options__$optionName({
           reqBody: { values: marketplaceContactMethods.value! },
           params: {
@@ -436,7 +439,7 @@ export const collection = defineStore("collection", () => {
       ),
     updateWatchedPublicationsWithSales = async () =>
       await call(
-        axios,
+        api,
         new POST__collection__options__$optionName({
           reqBody: {
             values: watchedPublicationsWithSales.value!,
@@ -459,7 +462,7 @@ export const collection = defineStore("collection", () => {
         isLoadingSuggestions.value = true;
         suggestions.value = (
           await call(
-            axios,
+            api,
             new GET__collection__stats__suggestedissues__$countrycode__$sincePreviousVisit__$sort__$limit(
               {
                 reqBody: {
@@ -484,7 +487,7 @@ export const collection = defineStore("collection", () => {
       ) {
         isLoadingSubscriptions.value = true;
         subscriptions.value = (
-          await call(axios, new GET__collection__subscriptions())
+          await call(api, new GET__collection__subscriptions())
         ).data.map((subscription: SubscriptionTransformedStringDates) => ({
           ...subscription,
           startDate: new Date(Date.parse(subscription.startDate)),
@@ -496,7 +499,7 @@ export const collection = defineStore("collection", () => {
     loadPopularIssuesInCollection = async () => {
       if (!popularIssuesInCollection.value) {
         popularIssuesInCollection.value = (
-          await call(axios, new GET__collection__popular())
+          await call(api, new GET__collection__popular())
         ).data.reduce(
           (acc, issue) => ({
             ...acc,
@@ -510,7 +513,7 @@ export const collection = defineStore("collection", () => {
     loadLastPublishedEdgesForCurrentUser = async () => {
       if (!lastPublishedEdgesForCurrentUser.value) {
         lastPublishedEdgesForCurrentUser.value = (
-          await call(axios, new GET__collection__edges__lastPublished())
+          await call(api, new GET__collection__edges__lastPublished())
         ).data;
       }
     },
@@ -519,7 +522,7 @@ export const collection = defineStore("collection", () => {
         isLoadingUser.value = true;
         try {
           if (Cookies.get("token")) {
-            user.value = (await call(axios, new GET__collection__user())).data;
+            user.value = (await call(api, new GET__collection__user())).data;
           }
         } catch (e) {
           console.error(e);
@@ -531,6 +534,9 @@ export const collection = defineStore("collection", () => {
       }
     };
   return {
+    setApi: (apiInstance: AxiosInstance) => {
+      api = apiInstance;
+    },
     collection,
     watchedPublicationsWithSales,
     purchases,