Merge branch 'refs/heads/development' into feature/suggest-clothes-test

# Conflicts:
#	src/main/kotlin/domain/models/CurrentWeather.kt

Author: AimanYosofi

src/main/kotlin/data/repository/WeatherRepositoryImpl.kt

@@ -1,4 +1,5 @@
 package data.repository
+
 import WeatherRepository
 import domain.models.CurrentWeather
 import domain.models.exceptions.FailedFetchWeatherDataException
@@ -7,13 +8,18 @@ import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
-const val OPEN_METO_API="https://api.open-meteo.com/v1/forecast"
+
+const val OPEN_METO_API = "https://api.open-meteo.com/v1/forecast"
+
 class WeatherRepositoryImpl(private val httpClient: HttpClient) : WeatherRepository {
     override suspend fun getCurrentWeather(latitude: Double, longitude: Double): CurrentWeather {
         val response: HttpResponse = httpClient.get(OPEN_METO_API) {
             parameter("latitude", latitude)
             parameter("longitude", longitude)
-            parameter("current", "temperature_2m,relative_humidity_2m,apparent_temperature,is_day,wind_speed_10m,snowfall,rain,weather_code,cloud_cover")
+            parameter(
+                "current",
+                "temperature_2m,relative_humidity_2m,apparent_temperature,is_day,wind_speed_10m,snowfall,rain,weather_code,cloud_cover"
+            )
         }
 
         if (!response.status.isSuccess()) {

src/main/kotlin/domain/models/CurrentWeather.kt

@@ -5,15 +5,12 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class CurrentWeather(
-    val time: String,
-    val interval: Double,
     @SerialName("temperature_2m") val temperature2m: Double,
     @SerialName("relative_humidity_2m") val relativeHumidity2m: Double,
     @SerialName("apparent_temperature") val apparentTemperature: Double,
     @SerialName("is_day") val isDay: Int,
     val rain: Double,
     val snowfall: Double,
-    @SerialName("weather_code") val weatherCode: Double,
     @SerialName("cloud_cover") val cloudCover: Double,
-    @SerialName("wind_speed_10m") val windSpeed10m: Double
+    @SerialName("wind_speed_10m") val windSpeed10m: Double,
 )

src/main/kotlin/domain/repository/WeatherRepository.kt

@@ -1,5 +1,5 @@
 import domain.models.CurrentWeather
 
 interface WeatherRepository {
-     suspend fun getCurrentWeather(latitude: Double, longitude: Double): CurrentWeather
+    suspend fun getCurrentWeather(latitude: Double, longitude: Double): CurrentWeather
 }

src/main/kotlin/domain/use_cases/GetCurrentWeatherUseCase.kt

@@ -1,4 +1,5 @@
 import domain.models.CurrentWeather
+
 class GetCurrentWeatherUseCase(private val repository: WeatherRepository) {
     suspend fun getCurrentWeather(latitude: Double, longitude: Double): CurrentWeather {
         return repository.getCurrentWeather(latitude, longitude)

src/test/kotlin/domain/use_cases/GetCurrentWeatherUseCaseTest.kt

@@ -2,20 +2,17 @@ package domain.use_cases
 
 import GetCurrentWeatherUseCase
 import WeatherRepository
+import com.google.common.truth.Truth
+import com.google.common.truth.Truth.assertThat
 import domain.models.CurrentWeather
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.mockk
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
-import org.junit.Assert.assertEquals
-import org.junit.Assert.fail
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import com.google.common.truth.Truth.assertThat
 import org.junit.jupiter.api.assertThrows
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class GetCurrentWeatherUseCaseTest {
 
     private lateinit var weatherRepository: WeatherRepository
@@ -24,15 +21,12 @@ class GetCurrentWeatherUseCaseTest {
     private val latitude = 55.7558
     private val longitude = 37.6173
     private val expectedWeather = CurrentWeather(
-        time = "2025-05-06T15:00",
-        interval = 100.0,
         temperature2m = 12.5,
         relativeHumidity2m = 67.0,
         apparentTemperature = 11.2,
         isDay = 1,
         rain = 0.1,
         snowfall = 0.0,
-        weatherCode = 3.0,
         cloudCover = 65.0,
         windSpeed10m = 6.8,
     )
@@ -43,6 +37,19 @@ class GetCurrentWeatherUseCaseTest {
         getCurrentWeatherUseCase = GetCurrentWeatherUseCase(weatherRepository)
     }
 
+    @Test
+    fun `should get the current weather from the WeatherRepository when getting the current weather`() =
+        runTest {
+            // Given
+            coEvery { weatherRepository.getCurrentWeather(latitude, longitude) } returns expectedWeather
+
+            // When
+            val result = getCurrentWeatherUseCase.getCurrentWeather(latitude, longitude)
+
+            // Then
+            coVerify(exactly = 1) { weatherRepository.getCurrentWeather(latitude, longitude) }
+        }
+
     @Test
     fun `should return current weather for given coordinates when getting the current weather`() = runTest {
         // Given
@@ -52,13 +59,13 @@ class GetCurrentWeatherUseCaseTest {
         val result = getCurrentWeatherUseCase.getCurrentWeather(latitude, longitude)
 
         // Then
-        coVerify(exactly = 1) { weatherRepository.getCurrentWeather(latitude, longitude) }
-        assertEquals(expectedWeather, result)
+        Truth.assertThat(expectedWeather).isEqualTo(result)
     }
 
     @Test
 
-    fun `should throw exception when repository fails`() = runTest {
+    fun `fun getCurrentWeather() should throw exception when repository fails`() = runTest {
+
         // Given
         val exceptionMessage = "API error"
         coEvery { weatherRepository.getCurrentWeather(latitude, longitude) } throws RuntimeException(exceptionMessage)
@@ -73,29 +80,34 @@ class GetCurrentWeatherUseCaseTest {
     }
 
     @Test
-    fun `should return weather with valid temperature value`() = runTest {
-        // Given
-        val modifiedWeather = expectedWeather.copy(temperature2m = 20.8)
-        coEvery { weatherRepository.getCurrentWeather(latitude, longitude) } returns modifiedWeather
-
-        // When
-        val result = getCurrentWeatherUseCase.getCurrentWeather(latitude, longitude)
+    fun `getCurrentWeather() should return expected weather data when valid latitude and longitude are provided()`() =
+        runTest {
+            // Given
+            val testLat = 33.3
+            val testLon = 44.4
+            val expected = expectedWeather.copy(temperature2m = 25.0)
+            coEvery { weatherRepository.getCurrentWeather(testLat, testLon) } returns expected
+
+            // When
+            val result = getCurrentWeatherUseCase.getCurrentWeather(testLat, testLon)
+
+            // Then
+            coVerify { weatherRepository.getCurrentWeather(testLat, testLon) }
+            assertThat(result).isEqualTo(expected)
+        }
 
-        // Then
-        assertThat(result.temperature2m).isEqualTo(20.8)
-    }
 
     @Test
-    fun `should call repository with zero coordinates`() = runTest {
-        // Given
-        val zeroLat = 0.0
-        val zeroLon = 0.0
-        coEvery { weatherRepository.getCurrentWeather(zeroLat, zeroLon) } returns expectedWeather
+    fun `getCurrentWeather() should call repository with zero coordinates when latitude and longitude are both zeros`() =
+        runTest {
+            val zeroLat = 0.0
+            val zeroLon = 0.0
+            coEvery { weatherRepository.getCurrentWeather(zeroLat, zeroLon) } returns expectedWeather
 
-        // When
-        val result = getCurrentWeatherUseCase.getCurrentWeather(zeroLat, zeroLon)
+            // When
+            getCurrentWeatherUseCase.getCurrentWeather(zeroLat, zeroLon)
 
-        // Then
-        coVerify { weatherRepository.getCurrentWeather(zeroLat, zeroLon) }
-    }
+            // Then
+            coVerify { weatherRepository.getCurrentWeather(zeroLat, zeroLon) }
+        }
 }