CID-2086: Add logs

leanix · Nov 7, 2023 · dba63e5 · dba63e5
1 parent 6ee9db1
commit dba63e5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/src/main/kotlin/net/leanix/vsm/githubbroker/connector/application/DoraService.kt b/src/main/kotlin/net/leanix/vsm/githubbroker/connector/application/DoraService.kt
@@ -13,8 +13,8 @@ import java.time.LocalDate
 @Service
 class DoraService(
     private val githubRepositoryProvider: GithubRepositoryProvider,
-    private val doraProvider: DoraProvider
-) {
+    private val doraProvider: DoraProvider,
+) : BaseConnectorService() {
 
     private val logger = LoggerFactory.getLogger(DoraService::class.java)
 
@@ -29,9 +29,14 @@ class DoraService(
                 if (it.isEmpty()) {
                     logger.info(
                         "Repository does not have any valid pull requests for DORA metrics. " +
-                            "Repository: ${repository.name}"
+                            "Repository: ${repository.name}",
                     )
                 } else {
+                    logInfoMessages(
+                        code = "vsm.dora.success",
+                        arguments = arrayOf(repository.name),
+                        assignment = assignment,
+                    )
                     it.forEach { dora ->
                         doraProvider.saveDora(dora, assignment, repository)
                     }

diff --git a/src/main/kotlin/net/leanix/vsm/githubbroker/connector/application/RepositoriesService.kt b/src/main/kotlin/net/leanix/vsm/githubbroker/connector/application/RepositoriesService.kt
@@ -21,9 +21,12 @@ class RepositoriesService(
     }
 
     private fun getRepositoriesPaginated(assignment: Assignment) {
+        logInfoMessages("vsm.repos.started", arrayOf(assignment.organizationName), assignment)
         var cursor: String? = null
         var totalRepos = 0
+        var page = 1
         do {
+            logInfoMessages("vsm.repos.page", arrayOf(page), assignment)
             val repos = githubRepositoryProvider
                 .getAllRepositories(assignment.organizationName, cursor)
                 .getOrElse {
@@ -35,8 +38,10 @@ class RepositoriesService(
             repositories
                 .forEach { repositoryService.save(it, assignment, STATE) }
             cursor = repos.cursor
+            page++
         } while (repos.hasNextPage)
         logInfoMessages("vsm.repos.total", arrayOf(totalRepos), assignment)
+        logInfoMessages("vsm.repos.finished", arrayOf(assignment.organizationName), assignment)
     }
 
     private fun handleExceptions(exception: Throwable, assignment: Assignment) {

diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
@@ -1,3 +1,7 @@
 vsm.repos.not_found=Zero repositories found in {0} GitHub organisation. Hint: In case organisation is valid, check if the inclusion list has at least one valid repository name.
 vsm.repos.total=Fetched Org Repositories Ids. Result : {0} repos
-vsm.repos.imported=Repository Imported
+vsm.repos.imported=Repository Imported
+vsm.repos.started=Started fetching repositories for organization: {0}
+vsm.repos.finished=Finished fetching repositories for organization: {0}
+vsm.repos.page=Fetching repositories page: {0}
+vsm.dora.success=DORA generated successfully for repository {0}
diff --git a/.../kotlin/net/leanix/vsm/githubbroker/connector/adapter/rest/GitHubWebhookControllerTest.kt b/.../kotlin/net/leanix/vsm/githubbroker/connector/adapter/rest/GitHubWebhookControllerTest.kt
@@ -122,7 +122,7 @@ class GitHubWebhookControllerTest {
 
             await.untilAsserted {
                 WireMock.verify(1, WireMock.postRequestedFor(WireMock.urlEqualTo("/services")))
-                WireMock.verify(1, WireMock.postRequestedFor(WireMock.urlEqualTo("/logs/admin")))
+                WireMock.verify(2, WireMock.postRequestedFor(WireMock.urlEqualTo("/logs/admin")))
             }
         }
 
@@ -148,7 +148,7 @@ class GitHubWebhookControllerTest {
                 )
                 WireMock.verify(0, WireMock.postRequestedFor(WireMock.urlEqualTo("/languages")))
                 WireMock.verify(0, WireMock.postRequestedFor(WireMock.urlEqualTo("/topics")))
-                WireMock.verify(1, WireMock.postRequestedFor(WireMock.urlEqualTo("/logs/admin")))
+                WireMock.verify(2, WireMock.postRequestedFor(WireMock.urlEqualTo("/logs/admin")))
             }
         }
     }
@@ -173,7 +173,7 @@ class GitHubWebhookControllerTest {
 
             await.untilAsserted {
                 WireMock.verify(1, WireMock.postRequestedFor(WireMock.urlEqualTo("/services")))
-                WireMock.verify(1, WireMock.postRequestedFor(WireMock.urlEqualTo("/logs/admin")))
+                WireMock.verify(2, WireMock.postRequestedFor(WireMock.urlEqualTo("/logs/admin")))
             }
         }
 

diff --git a/src/test/kotlin/net/leanix/vsm/githubbroker/connector/runner/InitialStateTest.kt b/src/test/kotlin/net/leanix/vsm/githubbroker/connector/runner/InitialStateTest.kt
@@ -48,7 +48,7 @@ class InitialStateTest {
             WireMock.verify(4, postRequestedFor(urlEqualTo("/services")))
             WireMock.verify(0, postRequestedFor(urlEqualTo("/languages")))
             WireMock.verify(0, postRequestedFor(urlEqualTo("/topics")))
-            WireMock.verify(8, postRequestedFor(urlEqualTo("/logs/admin")))
+            WireMock.verify(18, postRequestedFor(urlEqualTo("/logs/admin")))
             WireMock.verify(4, postRequestedFor(urlEqualTo("/dora")))
         }
     }