fix: dedupe api calls

Author: chenasraf

lib/Controller/ChecklistController.php

@@ -412,8 +412,8 @@ public function reorderItems(int $houseId, int $listId, array $items = []): Data
 	/**
 	 * Upload an image for an item
 	 *
-	 * Uploads the request body as an image into the user's configured pantry
-	 * image folder and attaches it to the item.
+	 * Expects a multipart/form-data request with the image file in a field
+	 * named **image**.
 	 *
 	 * @param int $houseId House id.
 	 * @param int $listId List id.

lib/Controller/PhotoController.php

@@ -193,6 +193,10 @@ public function indexPhotos(int $houseId, string $sortBy = 'custom', int $limit
 	/**
 	 * Upload a photo
 	 *
+	 * Expects a multipart/form-data request with the image file in a field
+	 * named **image**. The optional folderId and caption may be sent as
+	 * additional form fields.
+	 *
 	 * @param int $houseId House id.
 	 * @param int|null $folderId Optional folder id to place the photo in.
 	 * @param string|null $caption Optional caption.

openapi.json

@@ -2509,7 +2509,7 @@
             "post": {
                 "operationId": "checklist-upload-item-image",
                 "summary": "Upload an image for an item",
-                "description": "Uploads the request body as an image into the user's configured pantry image folder and attaches it to the item.",
+                "description": "Expects a multipart/form-data request with the image file in a field named **image**.",
                 "tags": [
                     "checklist"
                 ],
@@ -5576,6 +5576,7 @@
             "post": {
                 "operationId": "photo-upload-photo",
                 "summary": "Upload a photo",
+                "description": "Expects a multipart/form-data request with the image file in a field named **image**. The optional folderId and caption may be sent as additional form fields.",
                 "tags": [
                     "photo"
                 ],

src/api/prefs.ts

@@ -8,9 +8,19 @@ export interface UserPrefs {
   firstDayOfWeek: number
 }
 
-export async function getUserPrefs(): Promise<UserPrefs> {
-  const resp = await ocs.get<UserPrefs>('/prefs')
-  return resp.data ?? { lastHouseId: null, firstDayOfWeek: 1 }
+let userPrefsInflight: Promise<UserPrefs> | null = null
+
+export function getUserPrefs(): Promise<UserPrefs> {
+  if (userPrefsInflight) return userPrefsInflight
+
+  userPrefsInflight = ocs
+    .get<UserPrefs>('/prefs')
+    .then((resp) => resp.data ?? { lastHouseId: null, firstDayOfWeek: 1 })
+    .finally(() => {
+      userPrefsInflight = null
+    })
+
+  return userPrefsInflight
 }
 
 export async function setUserPrefs(patch: Partial<UserPrefs>): Promise<UserPrefs> {
@@ -70,15 +80,27 @@ const housePrefsDefaults: HousePrefs = {
   notifyItemDone: true,
 }
 
-export async function getHousePrefs(houseId: number): Promise<HousePrefs> {
-  const resp = await ocs.get<HousePrefs>(`/houses/${houseId}/prefs`)
-  return { ...housePrefsDefaults, ...resp.data }
+// Deduplicate concurrent getHousePrefs calls for the same house.
+const housePrefsInflight = new Map<number, Promise<HousePrefs>>()
+
+export function getHousePrefs(houseId: number): Promise<HousePrefs> {
+  const existing = housePrefsInflight.get(houseId)
+  if (existing) return existing
+
+  const promise = ocs
+    .get<HousePrefs>(`/houses/${houseId}/prefs`)
+    .then((resp) => ({ ...housePrefsDefaults, ...resp.data }))
+    .finally(() => housePrefsInflight.delete(houseId))
+
+  housePrefsInflight.set(houseId, promise)
+  return promise
 }
 
 export async function setHousePrefs(
   houseId: number,
   patch: Partial<HousePrefs>,
 ): Promise<HousePrefs> {
+  housePrefsInflight.delete(houseId)
   const resp = await ocs.put<HousePrefs>(`/houses/${houseId}/prefs`, patch)
   return { ...housePrefsDefaults, ...resp.data }
 }

src/composables/useHouses.ts

@@ -7,20 +7,31 @@ const loaded = ref(false)
 const loading = ref(false)
 const error = ref<string | null>(null)
 
-async function load(force = false): Promise<House[]> {
-  if (loaded.value && !force) return houses.value
+let inflight: Promise<House[]> | null = null
+
+function load(force = false): Promise<House[]> {
+  if (loaded.value && !force) return Promise.resolve(houses.value)
+  if (inflight && !force) return inflight
+
   loading.value = true
   error.value = null
-  try {
-    houses.value = await api.listHouses()
-    loaded.value = true
-  } catch (e) {
-    error.value = (e as Error).message
-    throw e
-  } finally {
-    loading.value = false
-  }
-  return houses.value
+  inflight = api
+    .listHouses()
+    .then((result) => {
+      houses.value = result
+      loaded.value = true
+      return result
+    })
+    .catch((e) => {
+      error.value = (e as Error).message
+      throw e
+    })
+    .finally(() => {
+      loading.value = false
+      inflight = null
+    })
+
+  return inflight
 }
 
 async function create(name: string, description?: string | null): Promise<House> {