Remove subjectType since subjectReference is used

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/PdfConfig.kt

@@ -29,7 +29,6 @@ data class PdfConfig(
  val pdfTitleSuffix: String? = null,
  val pdfStructureReference: String? = null,
  val subjectReference: String? = null,
- val subjectType: ResourceType? = null,
  val questionnaireReferences: List<String> = emptyList()
 ) : java.io.Serializable, Parcelable {
 

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/pdf/PdfLauncherFragment.kt

@@ -57,8 +57,7 @@ class PdfLauncherFragment : DialogFragment() {
  val pdfStructureId = pdfConfig.pdfStructureReference!!.extractLogicalIdUuid()
  val pdfTitle = StringBuilder().append(pdfConfig.pdfTitle ?: getString(R.string.default_html_title))
  val pdfTitleSuffix = pdfConfig.pdfTitleSuffix
- val subjectReference = pdfConfig.subjectReference!!.extractLogicalIdUuid()
- val subjectType = pdfConfig.subjectType!!
+ val subjectReference = pdfConfig.subjectReference!!
  val questionnaireIds = pdfConfig.questionnaireReferences.map { it.extractLogicalIdUuid() } ?: emptyList()
 
  lifecycleScope.launch(Dispatchers.IO) {
@@ -67,7 +66,6 @@ class PdfLauncherFragment : DialogFragment() {
  pdfLauncherViewModel.retrieveQuestionnaireResponse(
  questionnaireId,
  subjectReference,
- subjectType,
  )
  }
  val htmlBinary = pdfLauncherViewModel.retrieveBinary(pdfStructureId)

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/pdf/PdfLauncherViewModel.kt

@@ -44,35 +44,31 @@ constructor(
  * Retrieve the [QuestionnaireResponse] for the given questionnaire and subject.
  *
  * @param questionnaireId The ID of the questionnaire.
- * @param subjectId The ID of the subject.
- * @param subjectType The type of the subject (resource type).
+ * @param subjectReference The ID of the subject.
  * @return The [QuestionnaireResponse] if found, otherwise null.
  */
  suspend fun retrieveQuestionnaireResponse(
  questionnaireId: String,
- subjectId: String,
- subjectType: ResourceType,
+ subjectReference: String,
  ): QuestionnaireResponse? {
  val searchQuery =
- createQuestionnaireResponseSearchQuery(questionnaireId, subjectId, subjectType)
+ createQuestionnaireResponseSearchQuery(questionnaireId, subjectReference)
  return defaultRepository.search<QuestionnaireResponse>(searchQuery).firstOrNull()
  }
 
  /**
  * Create a search query for [QuestionnaireResponse].
  *
  * @param questionnaireId The ID of the questionnaire.
- * @param subjectId The ID of the subject.
- * @param subjectType The type of the subject (resource type).
+ * @param subjectReference The ID of the subject.
  * @return The search query for [QuestionnaireResponse].
  */
  private fun createQuestionnaireResponseSearchQuery(
  questionnaireId: String,
- subjectId: String,
- subjectType: ResourceType,
+ subjectReference: String,
  ): Search {
  return Search(ResourceType.QuestionnaireResponse).apply {
- filter(QuestionnaireResponse.SUBJECT, { value = "$subjectType/$subjectId" })
+ filter(QuestionnaireResponse.SUBJECT, { value = subjectReference })
  filter(
  QuestionnaireResponse.QUESTIONNAIRE,
  { value = "${ResourceType.Questionnaire}/$questionnaireId" },

android/quest/src/test/java/org/smartregister/fhircore/quest/ui/pdf/PdfLauncherFragmentTest.kt

@@ -56,7 +56,7 @@ class PdfLauncherFragmentTest : RobolectricTest() {
  val questionnaireResponse = QuestionnaireResponse().apply { questionnaire = "Questionnaire/id" }
  val htmlBinary = Binary().apply { content = "mock content".toByteArray() }
 
- coEvery { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any(), any()) } returns
+ coEvery { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any()) } returns
  questionnaireResponse
  coEvery { pdfLauncherViewModel.retrieveBinary(any()) } returns htmlBinary
 
@@ -66,7 +66,6 @@ class PdfLauncherFragmentTest : RobolectricTest() {
  pdfTitleSuffix = "suffix",
  pdfStructureReference = "Binary/id",
  subjectReference = "Patient/id",
- subjectType = ResourceType.Patient,
  questionnaireReferences = listOf("QuestionnaireResponse/id")
  )
  .encodeJson()
@@ -86,7 +85,7 @@ class PdfLauncherFragmentTest : RobolectricTest() {
 
  activity.supportFragmentManager.beginTransaction().add(fragment, null).commitNow()
 
- coVerify { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any(), any()) }
+ coVerify { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any()) }
  coVerify { pdfLauncherViewModel.retrieveBinary(any()) }
  verify { pdfGenerator.generatePdfWithHtml(any(), any(), any()) }
  }
@@ -96,7 +95,7 @@ class PdfLauncherFragmentTest : RobolectricTest() {
  val questionnaireResponse: QuestionnaireResponse? = null
  val htmlBinary = Binary().apply { content = "mock content".toByteArray() }
 
- coEvery { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any(), any()) } returns
+ coEvery { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any()) } returns
  questionnaireResponse
  coEvery { pdfLauncherViewModel.retrieveBinary(any()) } returns htmlBinary
 
@@ -106,7 +105,6 @@ class PdfLauncherFragmentTest : RobolectricTest() {
  pdfTitleSuffix = "suffix",
  pdfStructureReference = "Binary/id",
  subjectReference = "Patient/id",
- subjectType = ResourceType.Patient,
  questionnaireReferences = listOf("QuestionnaireResponse/id")
  )
  .encodeJson()
@@ -126,7 +124,7 @@ class PdfLauncherFragmentTest : RobolectricTest() {
 
  activity.supportFragmentManager.beginTransaction().add(fragment, null).commitNow()
 
- coVerify { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any(), any()) }
+ coVerify { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any()) }
  coVerify { pdfLauncherViewModel.retrieveBinary(any()) }
  verify(inverse = true) { pdfGenerator.generatePdfWithHtml(any(), any(), any()) }
  }
@@ -136,7 +134,7 @@ class PdfLauncherFragmentTest : RobolectricTest() {
  val questionnaireResponse = QuestionnaireResponse()
  val htmlBinary: Binary? = null
 
- coEvery { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any(), any()) } returns
+ coEvery { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any()) } returns
  questionnaireResponse
  coEvery { pdfLauncherViewModel.retrieveBinary(any()) } returns htmlBinary
 
@@ -146,7 +144,6 @@ class PdfLauncherFragmentTest : RobolectricTest() {
  pdfTitleSuffix = "suffix",
  pdfStructureReference = "Binary/id",
  subjectReference = "Patient/id",
- subjectType = ResourceType.Patient,
  questionnaireReferences = listOf("QuestionnaireResponse/id")
  )
  .encodeJson()
@@ -166,7 +163,7 @@ class PdfLauncherFragmentTest : RobolectricTest() {
 
  activity.supportFragmentManager.beginTransaction().add(fragment, null).commitNow()
 
- coVerify { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any(), any()) }
+ coVerify { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any()) }
  coVerify { pdfLauncherViewModel.retrieveBinary(any()) }
  verify(inverse = true) { pdfGenerator.generatePdfWithHtml(any(), any(), any()) }
  }
@@ -176,7 +173,7 @@ class PdfLauncherFragmentTest : RobolectricTest() {
  val questionnaireResponse: QuestionnaireResponse? = null
  val htmlBinary: Binary? = null
 
- coEvery { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any(), any()) } returns
+ coEvery { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any()) } returns
  questionnaireResponse
  coEvery { pdfLauncherViewModel.retrieveBinary(any()) } returns htmlBinary
 
@@ -186,7 +183,6 @@ class PdfLauncherFragmentTest : RobolectricTest() {
  pdfTitleSuffix = "suffix",
  pdfStructureReference = "Binary/id",
  subjectReference = "Patient/id",
- subjectType = ResourceType.Patient,
  questionnaireReferences = listOf("QuestionnaireResponse/id")
  )
  .encodeJson()
@@ -206,7 +202,7 @@ class PdfLauncherFragmentTest : RobolectricTest() {
 
  activity.supportFragmentManager.beginTransaction().add(fragment, null).commitNow()
 
- coVerify { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any(), any()) }
+ coVerify { pdfLauncherViewModel.retrieveQuestionnaireResponse(any(), any()) }
  coVerify { pdfLauncherViewModel.retrieveBinary(any()) }
  verify(inverse = true) { pdfGenerator.generatePdfWithHtml(any(), any(), any()) }
  }