feat: 仓库查询调整 TencentBlueKing#2136

zacYL · May 15, 2024 · 571b7c2 · 571b7c2
1 parent 81f6e89
commit 571b7c2
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/...ob/src/main/kotlin/com/tencent/bkrepo/job/batch/task/bkbase/RepoDetailReport2BkbaseJob.kt b/...ob/src/main/kotlin/com/tencent/bkrepo/job/batch/task/bkbase/RepoDetailReport2BkbaseJob.kt
@@ -34,19 +34,20 @@ import com.tencent.bkrepo.common.stream.constant.BinderType
 import com.tencent.bkrepo.common.stream.event.supplier.MessageSupplier
 import com.tencent.bkrepo.job.batch.base.DefaultContextMongoDbJob
 import com.tencent.bkrepo.job.batch.base.JobContext
-import com.tencent.bkrepo.job.batch.utils.RepositoryCommonUtils
 import com.tencent.bkrepo.job.batch.utils.TimeUtils
 import com.tencent.bkrepo.job.config.properties.RepoDetailReport2BkbaseJobProperties
 import com.tencent.bkrepo.job.pojo.project.TProjectMetrics
 import com.tencent.bkrepo.job.pojo.project.TRepoMetrics
 import org.slf4j.LoggerFactory
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.data.mongodb.core.query.Query
+import org.springframework.data.mongodb.core.query.isEqualTo
 import org.springframework.data.mongodb.core.query.where
 import org.springframework.stereotype.Component
 import java.time.Duration
 import java.time.LocalDate
 import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 import kotlin.reflect.KClass
 
 /**
@@ -101,15 +102,20 @@ class RepoDetailReport2BkbaseJob(
         val reportDate = LocalDateTime.now().withMinute(0).withSecond(0).withNano(0)
         current.repoMetrics.forEach {
             try {
-                val repo = RepositoryCommonUtils.getRepositoryDetail(current.projectId, it.repoName)
+                val query = Query(
+                    where(RepoInfo::projectId).isEqualTo(current.projectId)
+                        .and(RepoInfo::name.name).isEqualTo(it.repoName)
+                )
+                val repo = mongoTemplate.find(query, RepoInfo::class.java, COLLECTION_NAME_REPOSITORY).firstOrNull()
+                    ?: throw RepoNotFoundException("${current.projectId}/${it.repoName}")
                 result.add(
                     RepoDetail(
                         projectId = current.projectId,
                         repoName = repo.name,
                         repoUsage = it.size,
                         nodeNum = it.num,
                         repoType = it.type,
-                        createdDate = repo.createdDate,
+                        createdDate = repo.createdDate.format(DateTimeFormatter.ISO_DATE_TIME),
                         createdBy = repo.createdBy,
                         quota = repo.quota,
                         reportDate = reportDate
@@ -135,9 +141,18 @@ class RepoDetailReport2BkbaseJob(
         var reportDate: LocalDateTime,
     )
 
+    data class RepoInfo(
+        var projectId: String,
+        var name: String,
+        var createdDate: LocalDateTime,
+        var createdBy: String,
+        var quota: Long? = null
+    )
+
     companion object {
         private val logger = LoggerFactory.getLogger(RepoDetailReport2BkbaseJob::class.java)
         private const val COLLECTION_NAME_PROJECT_METRICS = "project_metrics"
+        private const val COLLECTION_NAME_REPOSITORY = "repository"
         private const val TOPIC = "bkbase-bkrepo-repo-detail"
     }
 }