⚡ Scheduler fix + controller

src/main/kotlin/com/albatros/springsecurity/data/model/database/Tender.kt

@@ -39,6 +39,8 @@ class Tender(
     var tenderNumOuter: String?,
     @Field(type = FieldType.Text, name = "user_id")
     var userId: String?,
+    @Field(type = FieldType.Text, name = "meta_data")
+    var metaData: String?
 )
 
 fun TenderDto.toDomainObject() =
@@ -57,5 +59,6 @@ fun TenderDto.toDomainObject() =
         tenderInnerLink = this.TenderLinkInner,
         tenderName = this.TenderName,
         tenderNumOuter = this.TenderNumOuter,
-        userId = this.User_id
+        userId = this.User_id,
+        metaData = this.searchFragmentXML?.fragment?.joinToString() ?: ""
     )

src/main/kotlin/com/albatros/springsecurity/data/model/database/TenderProvider.kt

@@ -2,15 +2,17 @@ package com.albatros.springsecurity.data.model.database
 
 import com.albatros.springsecurity.data.model.dto.TenderProviderDto
 import jakarta.persistence.Entity
+import jakarta.persistence.Id
 import org.springframework.validation.annotation.Validated
 
 @Entity
 @Validated
 class TenderProvider(
+    @Id
     var tenderId: Int,
     var etpName: String,
     var etpLink: String
-) : AbstractEntity()
+)
 
 fun TenderProviderDto.toDomainObject() =
     TenderProvider(

src/main/kotlin/com/albatros/springsecurity/data/repository/TenderRepository.kt

@@ -5,4 +5,16 @@ import org.springframework.data.elasticsearch.repository.ElasticsearchRepository
 import org.springframework.stereotype.Repository
 
 @Repository
-interface TenderRepository : ElasticsearchRepository<Tender, String>
+interface TenderRepository : ElasticsearchRepository<Tender, String> {
+    fun findAllByTenderId(tenderId: String): List<Tender>
+
+    fun findAllByCustomerContainsIgnoreCase(customer: String): List<Tender>
+
+    fun findAllByRegionContainsIgnoreCase(region: String): List<Tender>
+
+    fun findAllByCategory(category: String): List<Tender>
+
+    fun findAllByEtpEqualsIgnoreCase(etp: String): List<Tender>
+
+    fun findAllByTenderNameContainingIgnoreCase(query: String): List<Tender>
+}

src/main/kotlin/com/albatros/springsecurity/data/service/TenderApiService.kt

@@ -0,0 +1,14 @@
+package com.albatros.springsecurity.data.service
+
+import com.albatros.springsecurity.data.model.dto.TenderDto
+import com.albatros.springsecurity.data.model.dto.TenderInfoDto
+import com.albatros.springsecurity.data.model.dto.TenderProviderDto
+
+interface TenderApiService {
+
+    fun getAllTenderProviders(mode: String = "eauc"): MutableList<TenderProviderDto>?
+
+    fun getTendersByProviders(providerId: Int): List<TenderDto>?
+
+    fun getTenderInfoById(tenderId: Int): MutableList<TenderInfoDto>?
+}

src/main/kotlin/com/albatros/springsecurity/data/service/TenderApiServiceImpl.kt → src/main/kotlin/com/albatros/springsecurity/data/service/impl/TenderApiServiceImpl.kt

@@ -1,21 +1,23 @@
-package com.albatros.springsecurity.data.service
+package com.albatros.springsecurity.data.service.impl
 
 import com.albatros.springsecurity.config.webclient.TenderApiConfig
 import com.albatros.springsecurity.data.model.dto.TenderDto
 import com.albatros.springsecurity.data.model.dto.TenderInfoDto
 import com.albatros.springsecurity.data.model.dto.TenderProviderDto
+import com.albatros.springsecurity.data.service.TenderApiService
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.http.MediaType
 import org.springframework.stereotype.Service
 import org.springframework.web.reactive.function.client.WebClient
+import reactor.core.publisher.Mono
 
 @Service
-class TenderApiService(
+class TenderApiServiceImpl(
     private val tenderApiConfig: TenderApiConfig,
     private val webClient: WebClient
-) {
+) : TenderApiService {
 
-    fun getAllTenderProviders(mode: String = "eauc"): MutableList<TenderProviderDto>? = webClient
+    override fun getAllTenderProviders(mode: String): MutableList<TenderProviderDto>? = webClient
         .get()
         .uri("/export?mode=$mode&api_code=${tenderApiConfig.apiKey}&dtype=json")
         .accept(MediaType.APPLICATION_JSON)
@@ -24,18 +26,23 @@ class TenderApiService(
         .collectList()
         .block()
 
-    fun getTendersByProviders(providerId: Int): List<TenderDto>? = webClient
+    override fun getTendersByProviders(providerId: Int): List<TenderDto>? = webClient
         .get()
         .uri("/export?e$providerId=$providerId&api_code=${tenderApiConfig.apiKey}&dtype=json")
         .accept(MediaType.APPLICATION_JSON)
         .retrieve()
         .bodyToFlux(TenderDto::class.java)
         .collectList()
+        .onErrorResume {
+            Mono.just(
+                emptyList<TenderDto>()
+            )
+        }
         .block()
         ?.drop(1)
 
     @Cacheable(value = ["TenderInfo"], key = "#tenderId")
-    fun getTenderInfoById(tenderId: Int): MutableList<TenderInfoDto>? = webClient
+    override fun getTenderInfoById(tenderId: Int): MutableList<TenderInfoDto>? = webClient
         .get()
         .uri("/export?id=$tenderId&dtype=json")
         .accept(MediaType.APPLICATION_JSON)

src/main/kotlin/com/albatros/springsecurity/presentation/controller/TenderController.kt

@@ -1,23 +1,43 @@
 package com.albatros.springsecurity.presentation.controller
 
+import com.albatros.springsecurity.data.model.database.Tender
+import com.albatros.springsecurity.data.repository.TenderRepository
 import com.albatros.springsecurity.data.service.TenderApiService
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
 @RequestMapping("/api")
 class TenderController(
-    private val tenderService: TenderApiService
+    private val apiService: TenderApiService,
+    private val tenderRepository: TenderRepository
 ) {
 
-    @GetMapping("providers/")
-    fun getAll() = tenderService.getAllTenderProviders()
+    @GetMapping("/provider/")
+    fun getAll() = apiService.getAllTenderProviders()
 
-    @GetMapping("tenders/{id}")
-    fun getTendersByProviderId(@PathVariable id: Int) = tenderService.getTendersByProviders(id)
+    @GetMapping("/provider/{id}/tender")
+    fun getTendersByProviderId(@PathVariable id: Int) = apiService.getTendersByProviders(id)
 
-    @GetMapping("tenders/{id}/info")
-    fun getTenderInfoById(@PathVariable id: Int) = tenderService.getTenderInfoById(id)
+    @GetMapping("/tender/customer")
+    fun findAllByCustomerContainsIgnoreCase(@RequestParam customer: String): List<Tender> =
+        tenderRepository.findAllByCustomerContainsIgnoreCase(customer)
+
+    @GetMapping("/tender/region")
+    fun findAllByRegionContainsIgnoreCase(@RequestParam region: String): List<Tender> =
+        tenderRepository.findAllByRegionContainsIgnoreCase(region)
+
+    @GetMapping("/tender/category")
+    fun findAllByCategory(@RequestParam category: String): List<Tender> = tenderRepository.findAllByCategory(category)
+
+    @GetMapping("/tender/etp")
+    fun findAllByEtpEqualsIgnoreCase(@RequestParam etp: String): List<Tender> =
+        tenderRepository.findAllByEtpEqualsIgnoreCase(etp)
+
+    @GetMapping("/tender/name")
+    fun findAllByTenderNameContainingIgnoreCase(@RequestParam(value = "query") query: String): List<Tender> =
+        tenderRepository.findAllByTenderNameContainingIgnoreCase(query)
 }

src/main/kotlin/com/albatros/springsecurity/presentation/schedule/Scheduler.kt

@@ -22,31 +22,29 @@ class Scheduler(
     private val logger: Logger = LoggerFactory.getLogger(Scheduler::class.java)
 
     @Async
-    @Scheduled(fixedDelay = 100_000)
-    fun scheduleTenderProvidersData() {
-        logger.debug("Collecting providers data from external sources.")
+    @Scheduled(fixedDelay = 1_000_000)
+    fun scheduleTendersData() {
+
+        logger.info("Collecting providers data from external sources.")
         apiService.getAllTenderProviders()?.let {
             tenderProviderRepository.saveAll(
                 it.map(TenderProviderDto::toDomainObject)
             )
         }
 
-        logger.debug("Collection stopped.")
-    }
+        logger.info("Collection stopped.")
 
-    @Async
-    @Scheduled(fixedDelay = 100_000)
-    fun scheduleTendersData() {
-        logger.debug("Collecting tenders data from external sources.")
+        logger.info("Collecting tenders data from external sources.")
 
         tenderProviderRepository.findAll().forEach { provider ->
+            logger.info("Collecting for provider ${provider.etpName}.")
             apiService.getTendersByProviders(provider.tenderId)?.let {
                 tenderRepository.saveAll(
                     it.map(TenderDto::toDomainObject)
                 )
             }
         }
 
-        logger.debug("Collection stopped.")
+        logger.info("Collection stopped.")
     }
 }