[FEAT/#59] 캘린더뷰 / 월간 캘린더 서버통신 로직 구현 #90

boiledEgg-s · 2024-07-16T08:28:39Z

closed [FEAT] 캘린더뷰 / 기본 월간캘린더 서버통신 로직 #59

⛳️ Work Description

월간 캘린더 서버통신 로직 구현
서버와 직접적인 연결 X
추가 작업: 파생 브랜치 머지
- 월간 스크랩 목록 서버통신
- 일간 스크랩 목록 서버통신

📸 Screenshot

default.mp4

📢 To Reviewers

하다보니까 Feat에서 UI 로직을 너무 많이 바꾸게 됐어요,, 저도 수정 많은 리뷰 읽기 힘든데 내로남불 해버렸네요😓 앞으로 더욱 조심할게요,,,
Module, Repository, ViewModel, State, SideEffect, CalendarRoute, CalendarMonthScreen들 위주로 보시면 됩니다!!

# Conflicts: # feature/src/main/java/com/terning/feature/calendar/scrap/CalendarScrap.kt

…month # Conflicts: # feature/src/main/java/com/terning/feature/main/MainScreen.kt

arinming

캘린더 이거 어케햇어요...? 대단하다,,.,..........

arinming · 2024-07-16T12:33:22Z

app/src/main/java/com/terning/point/di/RepositoryModule.kt

@@ -12,6 +14,10 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 abstract class RepositoryModule {

+    @Binds
+    @Singleton
+    abstract fun scrapRepository(scrapRepositoryImpl: ScrapRepositoryImpl): ScrapRepository


bindScrapRepository 라는 네이밍 대신 scrapRepository로 쓰신 이유가 있나욤?

arinming · 2024-07-16T12:34:17Z

data/src/main/java/com/terning/data/datasourceimpl/ScrapDataSourceImpl.kt

+    override suspend fun getScrapMonth(request: ScrapRequestDto): BaseResponse<List<ScrapResponseDto>> =
+        BaseResponse(
+            status = 200,
+            message = "(월간) 스크랩된 공고 정보가 성공적으로 로드되었습니다.",


여기 하드코딩은 임의인가욥?

arinming · 2024-07-16T12:42:14Z

feature/src/main/java/com/terning/feature/calendar/calendar/CalendarRoute.kt

+                                onDateSelected = {
+                                    viewModel.updateSelectedDate(it)


newDate -> 로 직관적인 코드라고 생각했는데 삭제하신 이유가 있나용?!

다시 붙여야겠네요!

arinming · 2024-07-16T13:03:58Z

feature/src/main/java/com/terning/feature/calendar/month/CalendarMonth.kt

                            isToday = day.date.isToday(),
                            onDateSelected = onDateSelected
                        )
                        if(!day.isOutDate) {
-                            val index = day.date.dayOfMonth - 1
+                            val index = day.date.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd"))


자바 코드까지..

정말 멋있어...

arinming · 2024-07-16T13:18:18Z

feature/src/main/java/com/terning/feature/calendar/calendar/CalendarRoute.kt

안쓰는 import 삭제해주세요!

leeeyubin

굿굿~!! 넘 잘해서 코리 달 게 없어지고 있어요... 최고!!
수정하구 나면 한 번 더 노티 부탁드려용!

leeeyubin · 2024-07-16T15:22:26Z

feature/src/main/java/com/terning/feature/calendar/calendar/CalendarViewModel.kt

+                    )
+                }
+                _calendarSideEffect.emit(CalendarSideEffect.ShowToast(R.string.server_success))


성공했을 때는 따로 토스트 안 띄워줘도 될 것 같아요!!

leeeyubin · 2024-07-16T15:26:18Z

feature/src/main/java/com/terning/feature/calendar/month/CalendarMonthScreen.kt

+    }
+}
+
+
+@Composable
+fun HorizontalCalendar(


줄바꿈 조금만 신경 써주세요!

leeeyubin · 2024-07-16T15:27:07Z

feature/src/main/java/com/terning/feature/calendar/month/CalendarMonthScreen.kt

+    viewModel: CalendarViewModel = hiltViewModel()
+) {
+    val scrapState by viewModel.scrapCalendarState.collectAsState()
+
+    LaunchedEffect(key1 = listState) {


collectAsState() 바꿔주세용!

Hyobeen-Park

캘린더,,, 이걸 해낸다구?!?!?!?!?!??!!?? 이게 이석준이지~~ 진짜 수고하셨습니당❤️❤️❤️

Hyobeen-Park · 2024-07-16T16:07:48Z

app/src/main/java/com/terning/point/di/DataSourceModule.kt

@@ -12,6 +16,10 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 abstract class DataSourceModule {

+    @Binds
+    @Singleton
+    abstract fun bindScrapRepository(scrapDataSourceImpl: ScrapDataSourceImpl): ScrapDataSource


여기 위치가 DataSourceModule이라서 bindScrapDataSource로 네이밍 수정하는건 어떨까요??

Hyobeen-Park · 2024-07-16T16:09:20Z

data/src/main/java/com/terning/data/dto/response/ScrapResponseDto.kt

+fun getMockScrapList(year: Int, month: Int): List<ScrapResponseDto> {
+    val deadline = month.toString().padStart(2, '0')
+
+    return when (month % 4) {
+        0 -> {
+            listOf(
+                ScrapResponseDto(
+                    deadline = "${year}-${deadline}-13",
+                    scraps = listOf(
+                        ScrapResponseDto.Scrap(
+                            scrapId = 1,
+                            title = "제목1",
+                            color = "#FFED4E54"
+                        ),


머지하기 전에 꼭 확인해주세요!!

Hyobeen-Park · 2024-07-16T16:10:26Z

feature/src/main/java/com/terning/feature/calendar/calendar/CalendarRoute.kt

+        viewModel.calendarSideEffect.flowWithLifecycle(lifecycle = lifecycleOwner.lifecycle)
+            .collect { sideEffect ->
+                when (sideEffect) {
+                    is CalendarSideEffect.ShowToast -> context.toast(sideEffect.message)


sideEffect 최고에요~!~!

Hyobeen-Park · 2024-07-16T16:13:32Z

feature/src/main/java/com/terning/feature/calendar/month/CalendarMonth.kt

                            isToday = day.date.isToday(),
                            onDateSelected = onDateSelected
                        )
                        if(!day.isOutDate) {
-                            val index = day.date.dayOfMonth - 1
+                            val index = day.date.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd"))


정말 멋있어...

…month # Conflicts: # app/src/main/java/com/terning/point/di/DataSourceModule.kt # app/src/main/java/com/terning/point/di/RepositoryModule.kt # app/src/main/java/com/terning/point/di/ServiceModule.kt

[FEAT/#91] 캘린더뷰 / 스크랩 목록 서버통신

…month # Conflicts: # app/src/main/java/com/terning/point/di/DataSourceModule.kt # app/src/main/java/com/terning/point/di/ServiceModule.kt

…month

leeeyubin

LGTM~

arinming

LGTM~

boiledEgg-s added 16 commits July 14, 2024 04:30

[FEAT/#59] 스크랩 엔티티, Dto 생성

acc7547

[FEAT/#59] 스크랩 데이터소스 생성

ef23c12

[FEAT/#59] 스크랩 레포지토리 생성

2e52a96

[ADD/#59] 힐트 모듈 코드 추가

b6b97b4

[MOVE/#59] 패키지 구조 수정

8facc3d

Merge branch 'develop' into feat/#59-calendar-month

5cb9523

# Conflicts: # feature/src/main/java/com/terning/feature/calendar/scrap/CalendarScrap.kt

[MOD/#59] 서버 통신 로직 수정

a41c1c5

[FEAT/#59] 페이지 전환 시 서버 호출 구현

7c0ba19

[REFACTOR/#59] 월간 캘린더 호출 코드 리팩토링

a56ee6b

[MOD/#59] 기타 코드 수정

c71d01f

[FEAT/#59] SideEffect 추가

8682749

[REFACTOR/#59] UI 코드 리팩 및 네비게이터 추가

f817357

[FIX/#59] MainNavigator 재설정

3129dff

Merge remote-tracking branch 'origin/develop' into feat/#59-calendar-…

01028e3

…month # Conflicts: # feature/src/main/java/com/terning/feature/main/MainScreen.kt

[FIX/#59] MainNavigator 2차 재설정

9c9a462

[MOD/#59] Dto 매퍼 수정

12641e9

boiledEgg-s requested review from leeeyubin, arinming and Hyobeen-Park and removed request for arinming July 16, 2024 09:10

boiledEgg-s self-assigned this Jul 16, 2024

boiledEgg-s added FEAT ✨ 새로운 기능 구현 석준💜 석준 labels Jul 16, 2024

boiledEgg-s added this to the 1차 스프린트 서버통신 작업 milestone Jul 16, 2024

boiledEgg-s requested a review from arinming July 16, 2024 09:11

arinming approved these changes Jul 16, 2024

View reviewed changes

arinming reviewed Jul 16, 2024

View reviewed changes

feature/src/main/java/com/terning/feature/calendar/calendar/CalendarRoute.kt

Copy link

Contributor

arinming Jul 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

안쓰는 import 삭제해주세요!

arinming approved these changes Jul 16, 2024

View reviewed changes

leeeyubin reviewed Jul 16, 2024

View reviewed changes

[FEAT/#91] Dto 생성 및 이름 변경

8988ae8

Hyobeen-Park approved these changes Jul 16, 2024

View reviewed changes

boiledEgg-s and others added 23 commits July 17, 2024 01:23

[FEAT/#91] 레포지토리 코드 추가

2db05f0

[RENAME/#91] State 이름 변경

79a3ed2

[FEAT/#91] 뷰모델 로직 구현

88684e7

[FEAT/#91] 월간 스크랩 목록 구현

55be60d

[CHORE/#91] 월간 스크랩 목록 오류 수정

b64665b

[CHORE/#91] 월간 스크랩 목록 코드 수정

35e5ac2

[FEAT/#91] 일간 스크랩 목록 로직 구현

9cf9e7f

[CHORE/#91] 일간 스크랩 목록 로직 오류 수정

c22a402

[FEAT/#91] 일간 스크랩 목록 빈화면 적용

0200946

[REFACTOR/#91] 캘린더 전면 수정

e0db6a1

Merge remote-tracking branch 'origin/develop' into feat/#91-calendar-…

1ce7179

…month # Conflicts: # app/src/main/java/com/terning/point/di/DataSourceModule.kt # app/src/main/java/com/terning/point/di/RepositoryModule.kt # app/src/main/java/com/terning/point/di/ServiceModule.kt

[CHORE/#91] 컨플릭 수정

5717f6e

[REFACTOR/#91] 임포트 정리

76093d1

[MERGE] #91 -> #59

3f9a40d

[FEAT/#91] 캘린더뷰 / 스크랩 목록 서버통신

Merge remote-tracking branch 'origin/develop' into feat/#59-calendar-…

c9bf625

…month # Conflicts: # app/src/main/java/com/terning/point/di/DataSourceModule.kt # app/src/main/java/com/terning/point/di/ServiceModule.kt

[CHORE/#59] 서비스 코드 수정

4f58997

[RENAME/#59] 월간 캘린더 스크랩 파일 이름 변경

c256acd

Merge remote-tracking branch 'origin/develop' into feat/#59-calendar-…

36e70c5

…month

[RENAME/#59] 서비스 연결

e212c04

[REFACTOR/#59] 전체 코드 리팩토링

8802982

[ADD/#59] LifecycleOwner 추가

e6b1236

[DEL/#59] 더미 삭제

212ed27

[RENAME/#59] 데이터소스 네이밍 수정

7d4ec19

boiledEgg-s requested review from leeeyubin, arinming and Hyobeen-Park July 17, 2024 11:17

leeeyubin approved these changes Jul 17, 2024

View reviewed changes

arinming approved these changes Jul 17, 2024

View reviewed changes

boiledEgg-s merged commit 923dc21 into develop Jul 17, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FEAT/#59] 캘린더뷰 / 월간 캘린더 서버통신 로직 구현 #90

[FEAT/#59] 캘린더뷰 / 월간 캘린더 서버통신 로직 구현 #90

boiledEgg-s commented Jul 16, 2024 •

edited

Loading

arinming left a comment

arinming Jul 16, 2024

arinming Jul 16, 2024

arinming Jul 16, 2024

boiledEgg-s Jul 17, 2024

arinming Jul 16, 2024

Hyobeen-Park Jul 16, 2024

arinming Jul 16, 2024

leeeyubin left a comment

leeeyubin Jul 16, 2024

leeeyubin Jul 16, 2024

leeeyubin Jul 16, 2024

Hyobeen-Park left a comment

Hyobeen-Park Jul 16, 2024

Hyobeen-Park Jul 16, 2024

Hyobeen-Park Jul 16, 2024

Hyobeen-Park Jul 16, 2024

leeeyubin left a comment

arinming left a comment

[FEAT/#59] 캘린더뷰 / 월간 캘린더 서버통신 로직 구현 #90

[FEAT/#59] 캘린더뷰 / 월간 캘린더 서버통신 로직 구현 #90

Conversation

boiledEgg-s commented Jul 16, 2024 • edited Loading

⛳️ Work Description

📸 Screenshot

📢 To Reviewers

arinming left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

leeeyubin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Hyobeen-Park left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

leeeyubin left a comment

Choose a reason for hiding this comment

arinming left a comment

Choose a reason for hiding this comment

boiledEgg-s commented Jul 16, 2024 •

edited

Loading