🐛 DERCBOT-1250 / PR #1753, fixing test for FAQ with namespace (#1790)

Author: Benvii

bot/admin/server/src/test/kotlin/FaqAdminServiceSettingsTest.kt

@@ -72,7 +72,7 @@ class FaqAdminServiceSettingsTest : AbstractTest() {
         faqs: List<FaqDefinition>,
         stories: List<StoryDefinitionConfiguration>
     ) {
-        every { faqDefinitionDAO.getFaqDefinitionByBotId(any()) } answers { faqs }
+        every { faqDefinitionDAO.getFaqDefinitionByBotIdAndNamespace(any(), any()) } answers { faqs }
 
         every { AdminService.front.getIntentById(any()) } answers { intent }
 

bot/admin/server/src/test/kotlin/FaqAdminServiceTest.kt

@@ -281,9 +281,10 @@ class FaqAdminServiceTest : AbstractTest() {
                 every { faqDefinitionDAO.getFaqDefinitionById(any()) } answers { existingFaq }
                 every { faqDefinitionDAO.save(any()) } just Runs
                 every {
-                    faqDefinitionDAO.getFaqDefinitionByIntentIdAndBotId(
+                    faqDefinitionDAO.getFaqDefinitionByIntentIdAndBotIdAndNamespace(
                         eq(intentId),
-                        eq(botId)
+                        eq(botId),
+                        eq(namespace)
                     )
                 } answers { existingFaq }
             }
@@ -531,7 +532,7 @@ class FaqAdminServiceTest : AbstractTest() {
          */
         private fun initMocksForSharedIntentFaq(existingFaq: FaqDefinition) {
             every { faqDefinitionDAO.getFaqDefinitionByIntentId(any()) } answers { existingFaq }
-            every { faqDefinitionDAO.getFaqDefinitionByBotId(eq(OTHER_APP_NAME)) } answers { emptyList() }
+            every { faqDefinitionDAO.getFaqDefinitionByBotIdAndNamespace(eq(OTHER_APP_NAME), eq(defaultNamespace)) } answers { emptyList() }
             every { faqDefinitionDAO.save(any()) } just Runs
         }
 
@@ -620,9 +621,10 @@ class FaqAdminServiceTest : AbstractTest() {
             //GIVEN
             // new faq is created there was none before
             every {
-                faqDefinitionDAO.getFaqDefinitionByIntentIdAndBotId(
+                faqDefinitionDAO.getFaqDefinitionByIntentIdAndBotIdAndNamespace(
                     eq(intentId),
-                    eq(OTHER_APP_NAME)
+                    eq(OTHER_APP_NAME),
+                    eq(namespace)
                 )
             } answers { null }
 
@@ -710,9 +712,10 @@ class FaqAdminServiceTest : AbstractTest() {
             )
 
             every {
-                faqDefinitionDAO.getFaqDefinitionByIntentIdAndBotId(
+                faqDefinitionDAO.getFaqDefinitionByIntentIdAndBotIdAndNamespace(
                     eq(intentId),
-                    eq(OTHER_APP_NAME)
+                    eq(OTHER_APP_NAME),
+                    eq(namespace)
                 )
             } answers { existingFaqSharedIntentDefinition }
 
@@ -791,9 +794,10 @@ class FaqAdminServiceTest : AbstractTest() {
             )
 
             every {
-                faqDefinitionDAO.getFaqDefinitionByIntentIdAndBotId(
+                faqDefinitionDAO.getFaqDefinitionByIntentIdAndBotIdAndNamespace(
                     eq(intentId),
-                    eq(OTHER_APP_NAME)
+                    eq(OTHER_APP_NAME),
+                    eq(namespace)
                 )
             } answers { existingFaqSharedIntentDefinition }
 

nlp/front/storage-mongo/src/test/kotlin/FaqDefinitionMongoDAOTest.kt

@@ -108,7 +108,7 @@ class FaqDefinitionMongoDAOTest : AbstractTest() {
         faqDefinitionDao.save(faqDefinition)
         assertEquals(
             expected = faqDefinition,
-            actual = faqDefinitionDao.getFaqDefinitionByBotId(botId).first(),
+            actual = faqDefinitionDao.getFaqDefinitionByBotIdAndNamespace(botId, namespace).first(),
             message = "There should be something returned with an applicationId"
         )
         assertEquals(
@@ -144,12 +144,12 @@ class FaqDefinitionMongoDAOTest : AbstractTest() {
 
         assertEquals(
             expected = 2,
-            actual = faqDefinitionDao.getFaqDefinitionByBotId(botId).size,
+            actual = faqDefinitionDao.getFaqDefinitionByBotIdAndNamespace(botId, namespace).size,
             message = "There should be something returned with an applicationId"
         )
         assertEquals(
             expected = 1,
-            actual = faqDefinitionDao.getFaqDefinitionByBotId(botId2).size,
+            actual = faqDefinitionDao.getFaqDefinitionByBotIdAndNamespace(botId2, namespace).size,
             message = "There should be something returned with an applicationId"
         )
     }
@@ -241,12 +241,12 @@ class FaqDefinitionMongoDAOTest : AbstractTest() {
 
         assertEquals(3, col.countDocuments())
 
-        assertEquals(2, faqDefinitionDao.getFaqDefinitionByBotId(botId1).size)
+        assertEquals(2, faqDefinitionDao.getFaqDefinitionByBotIdAndNamespace(botId1, namespace).size)
 
         faqDefinitionDao.deleteFaqDefinitionByBotIdAndNamespace(botId1,namespace)
 
-        assertEquals(0, faqDefinitionDao.getFaqDefinitionByBotId(botId1).size)
-        assertEquals(1, faqDefinitionDao.getFaqDefinitionByBotId(botId2).size)
+        assertEquals(0, faqDefinitionDao.getFaqDefinitionByBotIdAndNamespace(botId1, namespace).size)
+        assertEquals(1, faqDefinitionDao.getFaqDefinitionByBotIdAndNamespace(botId2, namespace).size)
     }
 
     @Test
@@ -295,7 +295,7 @@ class FaqDefinitionMongoDAOTest : AbstractTest() {
         intentDefinitionDao.save(secondIntentWithIntentId3)
         faqDefinitionDao.save(secondFaqDefinition)
 
-        val tags = faqDefinitionDao.getTags(botId)
+        val tags = faqDefinitionDao.getTags(botId, namespace)
         assertEquals(tags, otherTagList + faqDefinition.tags)
     }