Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#64 [feat] 행복 루틴 추가하기(목록) 뷰 API 연결 #67

Merged
merged 11 commits into from
Jan 16, 2024

Conversation

pump9918
Copy link
Collaborator

📑 Work Description

  • 행복루틴 테마 리스트 조회 /api/v1/routines/happiness/themes 연결(GET)
  • 테마 별 행복루틴 리스트 조회 /api/v1/routines/happiness?themeId= 연결(GET)

🛠️ Issue

📷 Screenshot

Screen_Recording_20240116_143230_Softie.mp4

💬 To Reviewers

  • iconImageUrl은 서버에서 변경해줄 시 보일 예정입니다
  • ?themeId=을 빈 값으로 서버에 넘겨줘야 전체 페이지가 보이는데 nullable처리로 안됩니다ㅜㅜ(관련 지식 아시는 분들 코리 달아주시면 매우 감사)

@pump9918 pump9918 marked this pull request as ready for review January 16, 2024 05:37
@pump9918 pump9918 self-assigned this Jan 16, 2024
@pump9918 pump9918 added UI ui 관련 작업 호연🐻‍❄️ 호연이가 작업함! labels Jan 16, 2024
Copy link
Contributor

@stellar-halo stellar-halo left a comment

Choose a reason for hiding this comment

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

이제 조금 감이 오셨으려나요~~

Comment on lines +13 to +20
runCatching { happinessRoutineDataSource.getHappyChip() }.map { response ->
requireNotNull(response.data).toHappyChip()
}

override suspend fun getHappyContent(themeId: Int): Result<List<HappyContent>> =
runCatching { happinessRoutineDataSource.getHappyContent(themeId) }.map { response ->
requireNotNull(response.data).toHappyContent()
}
Copy link
Contributor

Choose a reason for hiding this comment

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

data class 내부 toHappyContent에서 map을 하고 있기 때문에 여기서 중복으로 해줄 필요는 없어 보입니다

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

이 부분을 반영하지 못하고 머지를 해버렸습니다ㅜ 추후 QA에 이슈를 파서 작업하겠습니다. 죄송합니다.

Copy link
Member

@minemi00 minemi00 left a comment

Choose a reason for hiding this comment

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

api 잘 붙이는법좀..

val title: String,
val content: String,
@DrawableRes val imageUrl: Int,
val iconImageUrl: String,
Copy link
Member

Choose a reason for hiding this comment

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

바꾸셨군용

@pump9918 pump9918 merged commit 9248bc5 into develop Jan 16, 2024
1 check passed
@pump9918 pump9918 deleted the feature/#64-feat-happy-addlist-server branch January 19, 2024 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
UI ui 관련 작업 호연🐻‍❄️ 호연이가 작업함!
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

[feat] 행복 루틴 추가하기(목록) 뷰 API 연결
3 participants