GFORMS-3068 - Restore dataRetrieves from snapshot forms (#2353)

hmrc · Dec 19, 2024 · d9ed694 · d9ed694
1 parent 4202acc
commit d9ed694
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/uk/gov/hmrc/gform/controllers/AuthenticatedRequestActions.scala b/app/uk/gov/hmrc/gform/controllers/AuthenticatedRequestActions.scala
@@ -659,7 +659,10 @@ case class AuthCacheWithoutForm(
   def toAuthCacheWithForm(form: Form, accessCode: Option[AccessCode]) =
     AuthCacheWithForm(
       retrievals,
-      dataRetrieve.fold(form)(_ => form.copy(thirdPartyData = form.thirdPartyData.copy(dataRetrieve = dataRetrieve))),
+      dataRetrieve.fold(form) { dr =>
+        val combined: Map[DataRetrieveId, DataRetrieveResult] = form.thirdPartyData.dataRetrieve.fold(dr)(_ ++ dr)
+        form.copy(thirdPartyData = form.thirdPartyData.copy(dataRetrieve = Some(combined)))
+      },
       FormTemplateContext.basicContext(formTemplate, None),
       role,
       accessCode,

diff --git a/app/uk/gov/hmrc/gform/eval/InitFormEvaluator.scala b/app/uk/gov/hmrc/gform/eval/InitFormEvaluator.scala
@@ -172,5 +172,7 @@ object InitFormEvaluator {
                      }
                    }
                  }
-    } yield cache.copy(dataRetrieve = Some(results.map(r => r.id -> r).toMap))
+    } yield
+      if (results.isEmpty) cache
+      else cache.copy(dataRetrieve = Some(results.map(r => r.id -> r).toMap))
 }