Ensure entity is added to the store before applying updates in upsertMany

Fixes for #3429

Author: dmelnik

packages/toolkit/src/entities/sorted_state_adapter.ts

@@ -160,12 +160,12 @@ export function createSortedStateAdapter<T, Id extends EntityId>(
       state,
     )
 
-    if (updated.length) {
-      updateManyMutably(updated, state)
-    }
     if (added.length) {
       addManyMutably(added, state, existingIdsArray)
     }
+    if (updated.length) {
+      updateManyMutably(updated, state)
+    }
   }
 
   function areArraysEqual(a: readonly unknown[], b: readonly unknown[]) {

packages/toolkit/src/entities/unsorted_state_adapter.ts

@@ -183,8 +183,8 @@ export function createUnsortedStateAdapter<T, Id extends EntityId>(
       state,
     )
 
-    updateManyMutably(updated, state)
     addManyMutably(added, state)
+    updateManyMutably(updated, state)
   }
 
   return {

packages/toolkit/src/entities/utils.ts

@@ -52,13 +52,15 @@ export function splitAddedUpdatedEntities<T, Id extends EntityId>(
   const existingIds = new Set<Id>(existingIdsArray)
 
   const added: T[] = []
+  const addedIds = new Set<Id>([])
   const updated: Update<T, Id>[] = []
 
   for (const entity of newEntities) {
     const id = selectIdValue(entity, selectId)
-    if (existingIds.has(id)) {
+    if (existingIds.has(id) || addedIds.has(id)) {
       updated.push({ id, changes: entity })
     } else {
+      addedIds.add(id)
       added.push(entity)
     }
   }