Fix the version collision in Knowledge Manager

knowledge/src/main/java/com/google/android/fhir/knowledge/KnowledgeManager.kt

@@ -88,7 +88,8 @@ internal constructor(
     val resType = ResourceType.fromCode(resourceType)
     val resourceEntities =
       when {
-        url != null -> listOfNotNull(knowledgeDao.getResourceWithUrl(url))
+        url != null && version != null ->
+          listOfNotNull(knowledgeDao.getResourceWithUrlAndVersion(url, version))
         id != null -> listOfNotNull(knowledgeDao.getResourceWithUrlLike("%$id"))
         name != null && version != null ->
           listOfNotNull(knowledgeDao.getResourcesWithNameAndVersion(resType, name, version))

knowledge/src/main/java/com/google/android/fhir/knowledge/db/impl/dao/KnowledgeDao.kt

@@ -39,7 +39,7 @@ abstract class KnowledgeDao {
 
     val resourceMetadata =
       if (resource.url != null) {
-        getResourceWithUrl(resource.url)
+        getResourceWithUrlAndVersion(resource.url, resource.version.orEmpty())
       } else {
         getResourcesWithNameAndVersion(resource.resourceType, resource.name, resource.version)
       }
@@ -83,9 +83,10 @@ abstract class KnowledgeDao {
     resourceType: ResourceType,
   ): List<ResourceMetadataEntity>
 
-  @Query("SELECT * from ResourceMetadataEntity WHERE url = :url")
-  internal abstract suspend fun getResourceWithUrl(
+  @Query("SELECT * from ResourceMetadataEntity WHERE url = :url AND version = :version")
+  internal abstract suspend fun getResourceWithUrlAndVersion(
     url: String,
+    version: String
   ): ResourceMetadataEntity?
   // Remove after https://github.com/google/android-fhir/issues/1920
   @Query("SELECT * from ResourceMetadataEntity WHERE url LIKE :urlPart")

knowledge/src/test/java/com/google/android/fhir/knowledge/KnowledgeManagerTest.kt

@@ -19,11 +19,14 @@ package com.google.android.fhir.knowledge
 import android.content.Context
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
+import ca.uhn.fhir.context.FhirContext
+import ca.uhn.fhir.context.FhirVersionEnum
 import com.google.android.fhir.knowledge.db.impl.KnowledgeDatabase
 import com.google.common.truth.Truth.assertThat
 import java.io.File
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
+import org.hl7.fhir.r4.model.Library
 import org.junit.After
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -91,4 +94,35 @@ internal class KnowledgeManagerTest {
     assertThat(knowledgeManager.loadResources(resourceType = "Measure", url = "Measure/ANCIND01"))
       .isNotNull()
   }
+
+  @Test
+  fun `inserting a library of a different version creates new entry`() = runTest {
+    val libraryAOld =
+      Library().apply {
+        id = "defaultA"
+        name = "defaultA"
+        url = "www.exampleA.com"
+        version = "A.1.0.0"
+      }
+    val libraryANew =
+      Library().apply {
+        id = "defaultA"
+        name = "defaultA"
+        url = "www.exampleA.com"
+        version = "A.1.0.1"
+      }
+
+    knowledgeManager.install(writeToFile(libraryAOld))
+    knowledgeManager.install(writeToFile(libraryANew))
+
+    val resources = knowledgeDb.knowledgeDao().getResources()
+    assertThat(resources).hasSize(2)
+  }
+
+  private val jsonParser = FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()
+  private fun writeToFile(library: Library): File {
+    return File(context.filesDir, library.name).apply {
+      writeText(jsonParser.encodeResourceToString(library))
+    }
+  }
 }