amplifyquery 1.0.7 → 1.0.9

package/dist/service.js

@@ -77,6 +77,14 @@ function findRelatedQueryKeys(modelName, queryClient) {
 function performOptimisticUpdate(queryClient, modelName, relatedQueryKeys, itemId, updateData) {
     return __awaiter(this, void 0, void 0, function* () {
         const previousDataMap = new Map();
+        // 🔧 버그 수정: updateData의 ID와 요청한 ID가 일치하는지 검증
+        const updateDataId = updateData === null || updateData === void 0 ? void 0 : updateData.id;
+        if (!updateDataId ||
+            typeof updateDataId !== "string" ||
+            updateDataId !== itemId) {
+            console.warn(`🍬 ${modelName} performOptimisticUpdate: ID mismatch! Expected: ${itemId}, UpdateData ID: ${updateDataId}. Skipping optimistic update.`);
+            return previousDataMap; // 빈 맵 반환으로 rollback 시 영향 없음
+        }
         // 1. Update individual item cache
         const singleItemQueryKey = [modelName, itemId];
         const previousItemSingle = queryClient.getQueryData(singleItemQueryKey);
@@ -123,7 +131,17 @@ function performOptimisticUpdate(queryClient, modelName, relatedQueryKeys, itemI
  */
 function handleCacheUpdateOnSuccess(queryClient, modelName, relatedQueryKeys, itemId, updatedItem) {
     // 1. Update individual item cache
-    queryClient.setQueryData([modelName, itemId], updatedItem);
+    const actualItemId = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.id;
+    // 🔧 버그 수정: 실제 아이템 ID와 요청한 ID가 일치하는지 검증
+    if (actualItemId &&
+        typeof actualItemId === "string" &&
+        actualItemId === itemId) {
+        queryClient.setQueryData([modelName, itemId], updatedItem);
+    }
+    else {
+        console.warn(`🍬 ${modelName} handleCacheUpdateOnSuccess: ID mismatch! Expected: ${itemId}, Actual: ${actualItemId}. Skipping cache update.`);
+        return; // ID가 일치하지 않으면 캐시 업데이트 중단
+    }
     // 2. Update list query cache (with relational filtering applied)
     relatedQueryKeys.forEach((queryKey) => {
         // Check if relational query - e.g. ["Mission", "Daily", "daily-id", ...]
@@ -395,7 +413,14 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             const { data: createdItem } = yield (0, client_1.getClient)().models[modelName].create(newItem, authModeParams);
                             // Update individual item cache on API success
                             if (createdItem) {
-                                query_1.queryClient.setQueryData([modelName, createdItem.id], createdItem);
+                                const itemId = createdItem === null || createdItem === void 0 ? void 0 : createdItem.id;
+                                // 🔧 버그 수정: ID가 유효한 경우에만 개별 캐시에 저장
+                                if (itemId && typeof itemId === "string") {
+                                    query_1.queryClient.setQueryData([modelName, itemId], createdItem);
+                                }
+                                else {
+                                    console.warn(`🍬 ${modelName} createList: Invalid createdItem ID found, skipping cache update:`, itemId, createdItem);
+                                }
                             }
                             return createdItem || newItem;
                         }
@@ -445,7 +470,16 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 if (!options.forceRefresh) {
                     const cachedItem = query_1.queryClient.getQueryData(singleItemQueryKey);
                     if (cachedItem) {
-                        return cachedItem;
+                        // 🔧 버그 수정: 캐시된 아이템의 실제 ID가 요청한 ID와 일치하는지 검증
+                        const itemId = cachedItem === null || cachedItem === void 0 ? void 0 : cachedItem.id;
+                        if (itemId === id) {
+                            return cachedItem;
+                        }
+                        else {
+                            // ID가 일치하지 않으면 캐시에서 제거하고 API 호출
+                            console.warn(`🍬 ${modelName} get: Cache ID mismatch! Requested: ${id}, Cached: ${itemId}. Removing invalid cache and fetching from API.`);
+                            query_1.queryClient.removeQueries({ queryKey: singleItemQueryKey });
+                        }
                     }
                 }
                 // Determine auth mode (use provided option if available)
@@ -453,31 +487,44 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 // Get parameters based on auth mode
                 const { authModeParams } = yield getOwnerByAuthMode(authMode);
                 // API call - apply auth mode
-                const { data: item } = yield (0, client_1.getClient)().models[modelName].get({ id }, authModeParams);
+                const { data: apiResponse } = yield (0, client_1.getClient)().models[modelName].get({ id }, authModeParams);
+                // Handle case where API returns array instead of single item
+                let item = apiResponse;
+                if (Array.isArray(apiResponse)) {
+                    console.warn(`🍬 ${modelName} get: API returned array instead of single item. Taking first item.`);
+                    item = apiResponse.find((i) => (i === null || i === void 0 ? void 0 : i.id) === id) || apiResponse[0] || null;
+                }
                 // Update cache
                 if (item) {
-                    query_1.queryClient.setQueryData(singleItemQueryKey, item);
-                    // Update related list queries (lists that might contain this item)
-                    const relatedQueryKeys = findRelatedQueryKeys(modelName, query_1.queryClient);
-                    relatedQueryKeys.forEach((queryKey) => {
-                        // Exclude single item keys, only process list queries
-                        if (queryKey.length > 1 && queryKey[1] !== id) {
-                            // Query keys with id as second element are not single item get query key format, so treat as list
-                            query_1.queryClient.setQueryData(queryKey, (oldData) => {
-                                const oldItems = Array.isArray(oldData) ? oldData : [];
-                                const exists = oldItems.some((oldItem) => oldItem && oldItem.id === id);
-                                if (exists) {
-                                    return oldItems.map((oldItem) => oldItem && oldItem.id === id ? item : oldItem);
-                                }
-                                else {
-                                    // Need to check if item matches list query filter conditions (not checking here)
-                                    // If checking is difficult, invalidateQueries might be safer
-                                    // Currently implemented to add item to all related lists that might contain it on API get success
-                                    return [...oldItems, item];
-                                }
-                            });
-                        }
-                    });
+                    const itemId = item === null || item === void 0 ? void 0 : item.id;
+                    // 🔧 버그 수정: API 응답 아이템의 ID가 요청한 ID와 일치하는지 검증
+                    if (itemId && typeof itemId === "string" && itemId === id) {
+                        query_1.queryClient.setQueryData(singleItemQueryKey, item);
+                        // Update related list queries (lists that might contain this item)
+                        const relatedQueryKeys = findRelatedQueryKeys(modelName, query_1.queryClient);
+                        relatedQueryKeys.forEach((queryKey) => {
+                            // Exclude single item keys, only process list queries
+                            if (queryKey.length > 1 && queryKey[1] !== id) {
+                                // Query keys with id as second element are not single item get query key format, so treat as list
+                                query_1.queryClient.setQueryData(queryKey, (oldData) => {
+                                    const oldItems = Array.isArray(oldData) ? oldData : [];
+                                    const exists = oldItems.some((oldItem) => oldItem && oldItem.id === id);
+                                    if (exists) {
+                                        return oldItems.map((oldItem) => oldItem && oldItem.id === id ? item : oldItem);
+                                    }
+                                    else {
+                                        // Need to check if item matches list query filter conditions (not checking here)
+                                        // If checking is difficult, invalidateQueries might be safer
+                                        // Currently implemented to add item to all related lists that might contain it on API get success
+                                        return [...oldItems, item];
+                                    }
+                                });
+                            }
+                        });
+                    }
+                    else {
+                        console.warn(`🍬 ${modelName} get: API response ID mismatch! Requested: ${id}, API Response ID: ${itemId}. Skipping cache update.`);
+                    }
                 }
                 return item || null;
             }
@@ -553,7 +600,14 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     query_1.queryClient.setQueryData(queryKey, filteredItems);
                     // Update individual item cache
                     filteredItems.forEach((item) => {
-                        query_1.queryClient.setQueryData([modelName, item.id], item);
+                        const itemId = item === null || item === void 0 ? void 0 : item.id;
+                        // 🔧 버그 수정: ID가 유효한 경우에만 개별 캐시에 저장
+                        if (itemId && typeof itemId === "string") {
+                            query_1.queryClient.setQueryData([modelName, itemId], item);
+                        }
+                        else {
+                            console.warn(`🍬 ${modelName} list: Invalid item ID found, skipping cache update:`, itemId, item);
+                        }
                     });
                     return filteredItems;
                 }
@@ -601,7 +655,14 @@ function createAmplifyService(modelName, defaultAuthMode) {
                         }
                         query_1.queryClient.setQueryData(queryKey, filteredItems);
                         filteredItems.forEach((item) => {
-                            query_1.queryClient.setQueryData([modelName, item.id], item);
+                            const itemId = item === null || item === void 0 ? void 0 : item.id;
+                            // 🔧 버그 수정: ID가 유효한 경우에만 개별 캐시에 저장
+                            if (itemId && typeof itemId === "string") {
+                                query_1.queryClient.setQueryData([modelName, itemId], item);
+                            }
+                            else {
+                                console.warn(`🍬 ${modelName} list fallback: Invalid item ID found, skipping cache update:`, itemId, item);
+                            }
                         });
                         return filteredItems;
                     }
@@ -980,7 +1041,14 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 query_1.queryClient.setQueryData(queryKey, filteredItems);
                 // Update individual item cache
                 filteredItems.forEach((item) => {
-                    query_1.queryClient.setQueryData([modelName, item.id], item);
+                    const itemId = item === null || item === void 0 ? void 0 : item.id;
+                    // 🔧 버그 수정: ID가 유효한 경우에만 개별 캐시에 저장
+                    if (itemId && typeof itemId === "string") {
+                        query_1.queryClient.setQueryData([modelName, itemId], item);
+                    }
+                    else {
+                        console.warn(`🍬 ${modelName} customList: Invalid item ID found, skipping cache update:`, itemId, item);
+                    }
                 });
                 return filteredItems;
             }
@@ -1093,7 +1161,19 @@ function createAmplifyService(modelName, defaultAuthMode) {
             // Interface functions implementation
             const getItem = (0, react_1.useCallback)((id) => {
                 // Use useQueryData to get latest single item from current cache
-                return hookQueryClient.getQueryData([modelName, id]);
+                const cachedItem = hookQueryClient.getQueryData([modelName, id]);
+                // 🔧 버그 수정: 캐시된 아이템의 ID가 요청한 ID와 일치하는지 검증
+                if (cachedItem) {
+                    const itemId = cachedItem === null || cachedItem === void 0 ? void 0 : cachedItem.id;
+                    if (itemId === id) {
+                        return cachedItem;
+                    }
+                    else {
+                        console.warn(`🍬 ${modelName} useHook.getItem: Cache ID mismatch! Requested: ${id}, Cached: ${itemId}. Returning undefined.`);
+                        return undefined;
+                    }
+                }
+                return undefined;
             }, [hookQueryClient, modelName]);
             const createItem = (0, react_1.useCallback)((data) => __awaiter(this, void 0, void 0, function* () {
                 try {
@@ -1166,7 +1246,14 @@ function createAmplifyService(modelName, defaultAuthMode) {
             const hookQueryClient = (0, react_query_1.useQueryClient)();
             const singleItemQueryKey = [modelName, id];
             // First check data from cache
-            const cachedData = hookQueryClient.getQueryData(singleItemQueryKey);
+            const rawCachedData = hookQueryClient.getQueryData(singleItemQueryKey);
+            // 🔧 버그 수정: 캐시된 데이터의 ID가 요청한 ID와 일치하는지 검증
+            const cachedData = rawCachedData && (rawCachedData === null || rawCachedData === void 0 ? void 0 : rawCachedData.id) === id
+                ? rawCachedData
+                : undefined;
+            if (rawCachedData && !cachedData) {
+                console.warn(`🍬 ${modelName} useItemHook: Cache ID mismatch! Requested: ${id}, Cached: ${rawCachedData === null || rawCachedData === void 0 ? void 0 : rawCachedData.id}. Ignoring cached data.`);
+            }
             // Single item query
             const { data: item, isLoading, error, refetch, } = (0, react_query_1.useQuery)({
                 queryKey: singleItemQueryKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplifyquery",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Amplify+Query",
   "keywords": [
     "Amplify",