Skip to content

Commit 06355a3

Browse files
jeeminiminijeeminimini
authored
Merge branch 'develop' into feature-firebase
2 parents de5ca58 + 0634efd commit 06355a3

32 files changed

+552
-92
lines changed

β€Ždata/src/main/java/com/stop/data/local/model/Alarm.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ data class Alarm(
88
val startPosition: String,
99
val endPosition: String,
1010
val routes: List<String>,
11-
val lastTime: String,
12-
val alarmTime: String,
11+
val lastTime: String, // 막차 μ‹œκ°„ -> 23:30:15 μ‹œλΆ„μ΄ˆ
12+
val alarmTime: Int, // 10λΆ„ μ „ μ•ŒλžŒ μ„€μ • -> 10
13+
val alarmCode: Int, // μ•ŒλžŒμ„ μ‹λ³„ν•˜κΈ° μœ„ν•œ μ•ŒλžŒ ID
1314
val alarmMethod: Boolean,
1415
val isMission: Boolean,
1516
) {
@@ -20,6 +21,7 @@ data class Alarm(
2021
routes,
2122
lastTime,
2223
alarmTime,
24+
alarmCode,
2325
alarmMethod,
2426
isMission
2527
)

β€Ždata/src/main/java/com/stop/data/model/alarm/AlarmRepositoryItem.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ data class AlarmRepositoryItem(
77
val startPosition: String,
88
val endPosition: String,
99
val routes: List<String>,
10-
val lastTime: String,
11-
val alarmTime: String,
10+
val lastTime: String, // 막차 μ‹œκ°„ -> 23:30:15 μ‹œλΆ„μ΄ˆ
11+
val alarmTime: Int, // 10λΆ„ μ „ μ•ŒλžŒ μ„€μ • -> 10
12+
val alarmCode: Int, // μ•ŒλžŒμ„ μ‹λ³„ν•˜κΈ° μœ„ν•œ μ•ŒλžŒ ID
1213
val alarmMethod: Boolean,
1314
val isMission: Boolean,
1415
) {
@@ -19,6 +20,7 @@ data class AlarmRepositoryItem(
1920
routes,
2021
lastTime,
2122
alarmTime,
23+
alarmCode,
2224
alarmMethod,
2325
isMission
2426
)
@@ -29,6 +31,7 @@ data class AlarmRepositoryItem(
2931
routes,
3032
lastTime,
3133
alarmTime,
34+
alarmCode,
3235
alarmMethod,
3336
isMission
3437
)

β€Ždata/src/main/java/com/stop/data/remote/model/route/gyeonggi/GyeonggiBusLastTimeResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ import com.tickaroo.tikxml.annotation.Xml
88
internal data class GyeonggiBusLastTimeResponse(
99
@Path("msgBody")
1010
@Element(name = "busRouteInfoItem")
11-
val lastTimes: List<GyeonggiBusLastTime>
11+
val lastTimes: List<GyeonggiBusLastTime>?
1212
)

β€Ždata/src/main/java/com/stop/data/remote/source/route/RouteRemoteDataSource.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ internal interface RouteRemoteDataSource {
2929

3030
suspend fun getSeoulBusStationArsId(stationName: String): List<BusStationInfo>
3131
suspend fun getSeoulBusRoute(stationId: String): List<BusRouteInfo>
32-
suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo>
32+
suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo>?
3333

3434
suspend fun getGyeonggiBusStationId(stationName: String): List<GyeonggiBusStation>
3535
suspend fun getGyeonggiBusRoute(stationId: String): List<GyeonggiBusRoute>
36-
suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>
36+
suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>?
3737
suspend fun getGyeonggiBusRouteStations(lineId: String): List<GyeonggiBusStation>
3838
}

β€Ždata/src/main/java/com/stop/data/remote/source/route/RouteRemoteDataSourceImpl.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
140140
override suspend fun getSeoulBusLastTime(
141141
stationId: String,
142142
lineId: String
143-
): List<LastTimeInfo> {
143+
): List<LastTimeInfo>? {
144144
with(wsBusApiService.getBusLastTime(stationId, lineId)) {
145145
return when (this) {
146146
is NetworkResult.Success -> this.data.lastTimeMsgBody.lastTimes
@@ -173,10 +173,10 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
173173
}
174174
}
175175

176-
override suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime> {
176+
override suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>? {
177177
with(apisDataService.getBusLastTime(lineId)) {
178178
return when (this) {
179-
is NetworkResult.Success -> this.data.lastTimes.map { it.toDomain() }
179+
is NetworkResult.Success -> this.data.lastTimes?.map { it.toDomain() }
180180
is NetworkResult.Failure -> throw IllegalArgumentException(this.message)
181181
is NetworkResult.NetworkError -> throw this.exception
182182
is NetworkResult.Unexpected -> throw this.exception

β€Ždata/src/main/java/com/stop/data/repository/AlarmRepositoryImpl.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ internal class AlarmRepositoryImpl @Inject constructor(
2020
alarmUseCaseItem.routes,
2121
alarmUseCaseItem.lastTime,
2222
alarmUseCaseItem.alarmTime,
23+
alarmUseCaseItem.alarmCode,
2324
alarmUseCaseItem.alarmMethod,
2425
alarmUseCaseItem.isMission
2526
)

β€Ždata/src/main/java/com/stop/data/repository/RouteRepositoryImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ internal class RouteRepositoryImpl @Inject constructor(
7676
return remoteDataSource.getSeoulBusRoute(stationId)
7777
}
7878

79-
override suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo> {
79+
override suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo>? {
8080
return remoteDataSource.getSeoulBusLastTime(stationId, lineId)
8181
}
8282

@@ -88,7 +88,7 @@ internal class RouteRepositoryImpl @Inject constructor(
8888
return remoteDataSource.getGyeonggiBusRoute(stationId)
8989
}
9090

91-
override suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime> {
91+
override suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>? {
9292
return remoteDataSource.getGyeonggiBusLastTime(lineId)
9393
}
9494

β€Ždomain/src/main/java/com/stop/domain/model/alarm/AlarmUseCaseItem.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ data class AlarmUseCaseItem(
44
val startPosition: String,
55
val endPosition: String,
66
val routes: List<String>,
7-
val lastTime: String,
8-
val alarmTime: String,
9-
val alarmMethod: Boolean,
7+
val lastTime: String, // 막차 μ‹œκ°„ -> 23:30:15 μ‹œλΆ„μ΄ˆ
8+
val alarmTime: Int, // 10λΆ„ μ „ μ•ŒλžŒ μ„€μ • -> 10
9+
val alarmCode: Int, // μ•ŒλžŒμ„ μ‹λ³„ν•˜κΈ° μœ„ν•œ μ•ŒλžŒ ID
10+
val alarmMethod: Boolean, // true μ†Œλ¦¬ false 진동
1011
val isMission: Boolean,
1112
)

β€Ždomain/src/main/java/com/stop/domain/model/route/seoul/bus/LastTimeMsgBody.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ import com.squareup.moshi.JsonClass
66
@JsonClass(generateAdapter = true)
77
data class LastTimeMsgBody(
88
@Json(name = "itemList")
9-
val lastTimes: List<LastTimeInfo>
9+
val lastTimes: List<LastTimeInfo>?
1010
)

β€Ždomain/src/main/java/com/stop/domain/repository/RouteRepository.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ interface RouteRepository {
3030

3131
suspend fun getSeoulBusStationArsId(stationName: String): List<BusStationInfo>
3232
suspend fun getSeoulBusRoute(stationId: String): List<BusRouteInfo>
33-
suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo>
33+
suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo>?
3434
suspend fun getSubwayRoute(
3535
routeRequest: RouteRequest,
3636
subwayLine: String,
@@ -40,6 +40,6 @@ interface RouteRepository {
4040

4141
suspend fun getGyeonggiBusStationId(stationName: String): List<GyeonggiBusStation>
4242
suspend fun getGyeonggiBusRoute(stationId: String): List<GyeonggiBusRoute>
43-
suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>
43+
suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>?
4444
suspend fun getGyeonggiBusRouteStations(lineId: String): List<GyeonggiBusStation>
4545
}

0 commit comments

Comments
Β (0)