Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions fastlane/metadata/ko/release_notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
β€’ λ‘œκ·ΈμΈμ„ μ•± λ‚΄λΆ€ ν™”λ©΄ λŒ€μ‹  기기의 λΈŒλΌμš°μ €λ‘œ μ§„ν–‰ν•˜λ„λ‘ λ³€κ²½ν•΄ 더 μ•ˆμ „ν•˜κ²Œ λ‘œκ·ΈμΈν•  수 μžˆμŠ΅λ‹ˆλ‹€.
β€’ μ˜ˆμ•½μ„ μ·¨μ†Œν•œ 직후 같은 κΈ°κΈ°λ₯Ό λ‹€μ‹œ μ˜ˆμ•½ν•  λ•Œ 이미 μ‚¬μš© 쀑이라고 잘λͺ» μ•ˆλ‚΄λ˜λ˜ 문제λ₯Ό κ°œμ„ ν–ˆμŠ΅λ‹ˆλ‹€.
β€’ μ„œλ²„ 였λ₯˜ λ°œμƒ μ‹œ 더 μ •ν™•ν•œ μ•ˆλ‚΄ λ©”μ‹œμ§€κ°€ ν‘œμ‹œλ˜λ„λ‘ κ°œμ„ ν–ˆμŠ΅λ‹ˆλ‹€.
β€’ 세탁 μ§„ν–‰ μƒνƒœμ™€ μ•Œλ¦Ό λͺ©λ‘μ΄ 더 μ •ν™•ν•˜κ²Œ κ°±μ‹ λ˜λ„λ‘ κ°œμ„ ν–ˆμŠ΅λ‹ˆλ‹€.
5 changes: 3 additions & 2 deletions lib/features/alarm/data/data_sources/alarm_data_source.dart
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ class AlarmDataSourceImpl implements AlarmDataSource {
return const AlarmListResponse(data: []);
}

// μ„œλ²„ 응닡은 `{ notifications: [...] }` ν˜•νƒœλ‘œ λ΄‰νˆ¬κ°€ μ—†λ‹€.
return AlarmListResponse.fromJson(castJsonMap(response.data));
final body = castJsonMap(response.data);
final data = body.containsKey('data') ? extractDataMap(body) : body;
return AlarmListResponse.fromJson(data);
}

@override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,8 @@ class ReservationSyncController {
return;
}

final hasPendingReservation = latest.any(
(reservation) => reservation.laundryStatus == LaundryStatus.reserved,
);
if (!hasPendingReservation) {
final shouldKeepPolling = latest.any(_shouldKeepPolling);
if (!shouldKeepPolling) {
stopPolling();
}

Expand Down Expand Up @@ -117,4 +115,17 @@ class ReservationSyncController {

return listEquals(current, latest);
}

bool _shouldKeepPolling(ActiveReservationModel reservation) {
if (reservation.laundryStatus == LaundryStatus.reserved) {
return true;
}

return reservation.laundryStatus == LaundryStatus.inUse &&
!_hasText(reservation.expectedCompletionTime);
}

bool _hasText(String? value) {
return value != null && value.trim().isNotEmpty;
}
}
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name: washer
description: "A new Flutter project."
# The following line prevents the package from being accidentally published to
Expand All @@ -16,7 +16,7 @@
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 1.1.5+6
version: 1.1.5+7

environment:
sdk: ^3.9.2
Expand Down
Loading