fix compileation eror

This commit is contained in:
androidlover5842
2026-01-26 14:56:52 +05:30
parent 9835435aab
commit 31398d3822
5 changed files with 30 additions and 26 deletions

View File

@@ -1,18 +1,18 @@
package com.android.trisolarisserver.config
import org.springframework.boot.web.client.RestTemplateBuilder
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.http.client.SimpleClientHttpRequestFactory
import org.springframework.web.client.RestTemplate
import java.time.Duration
@Configuration
class HttpConfig {
@Bean
fun restTemplate(builder: RestTemplateBuilder): RestTemplate {
return builder
.setConnectTimeout(Duration.ofSeconds(10))
.setReadTimeout(Duration.ofMinutes(5))
.build()
fun restTemplate(): RestTemplate {
val factory = SimpleClientHttpRequestFactory().apply {
setConnectTimeout(10_000)
setReadTimeout(5 * 60 * 1_000)
}
return RestTemplate(factory)
}
}

View File

@@ -5,7 +5,7 @@ import com.android.trisolarisserver.controller.dto.GuestResponse
import com.android.trisolarisserver.controller.dto.GuestVehicleRequest
import com.android.trisolarisserver.models.booking.Guest
import com.android.trisolarisserver.models.booking.GuestVehicle
import com.android.trisolarisserver.repo.GuestRepo
import com.android.trisolarisserver.db.repo.GuestRepo
import com.android.trisolarisserver.repo.GuestVehicleRepo
import com.android.trisolarisserver.repo.PropertyRepo
import com.android.trisolarisserver.security.MyPrincipal
@@ -85,7 +85,7 @@ class Guests(
vehicleNumber = request.vehicleNumber.trim()
)
guestVehicleRepo.save(vehicle)
return listOf(guest).toResponse(guestVehicleRepo).first()
return setOf(guest).toResponse(guestVehicleRepo).first()
}
private fun requirePrincipal(principal: MyPrincipal?) {

View File

@@ -20,7 +20,7 @@ class Organization {
joinColumns = [JoinColumn(name = "org_id")]
)
@Column(name = "email", nullable = false)
var emailAliases: MutableSet<String> = mutableSetOf(),
var emailAliases: MutableSet<String> = mutableSetOf()
@ElementCollection(fetch = FetchType.EAGER)
@CollectionTable(
@@ -30,7 +30,7 @@ class Organization {
@Column(name = "mode", nullable = false)
@Enumerated(EnumType.STRING)
var allowedTransportModes: MutableSet<com.android.trisolarisserver.models.booking.TransportMode> =
mutableSetOf(),
mutableSetOf()
@Column(name = "created_at", nullable = false, columnDefinition = "timestamptz")
val createdAt: OffsetDateTime = OffsetDateTime.now()