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.

Sign up for GitHub

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

Jump to bottom

[Feature] 내 상점 정보 수정 api 연동 #322

Merged
merged 32 commits into from
Jul 17, 2024
Merged

[Feature] 내 상점 정보 수정 api 연동 #322

merged 32 commits into from
Jul 17, 2024

Conversation

skdud0629
Copy link
Member

@skdud0629 skdud0629 commented Jul 16, 2024 •
edited
Loading

개요

  • 사장님 내 상점 수정 페이지
    • 가게 정보 및 운영 시간 변경 api 연동

작업 상세내용

  • 가게 상세 정보 수정
    • LaunchedEffect의 키값을 storeInfo로 할당함으로써 가게 정보를 수정되었을 때 현재 상점 페이지에 수정된 정보를 반영함
    • 모든 요일의 운영 시간을 포함하기 위해 상점 정보를 담는 데이터 클래스를 StoreWithMenu에서 StoreDetailInfo로 변경했다.

결과 화면

추후 작업 사항

  • 상점 대표 이미지 수정 (다중 이미지 업로드)

skdud0629 added 19 commits July 14, 2024 18:48
@skdud0629
Change StoreWithMenu->StoreDetailInfo
3fda243
@skdud0629
Add modify owner shop info api
d807e15
@skdud0629
Add toStoreDetailInfo and toOperatingTime Mapper
5ba0988
@skdud0629
Modify MyStoreInfoList
8157c95
@skdud0629
Add button click event
8df2a97
@skdud0629
Merge remote-tracking branch 'origin/develop' into modify-store-info
b22463f
@skdud0629
Modify days_one_letter string array
a238540
@skdud0629
Add dayOfWeekToIndex
bb36f46
@skdud0629
Delete operatingTimeList and Add storeInfo state
67ed84e
@skdud0629
Add modifyInfoViewModel to ModifyInfoNavigator
b07b2ed
@skdud0629
Change storeInfo from nullable to non-nullable.
c01a6ce
@skdud0629
Change parameter structures and storeInfo update functions in ModifyI…
8ac42a0 
…nfoViewModel
@skdud0629
Modify store operating time logic
e7ce6d3
@skdud0629
Modify resource id and Change state, viewmodel
713269d
@skdud0629
Delete unnecessary code
ebc96dd
@skdud0629
Add store operating hours update logic
96f60dc
@skdud0629
Modify store info initialization
ab6a91c
@skdud0629
Add store navigation logic
db6c605
@skdud0629
Add Navigation and LaunchedEffect
9a52d02
@skdud0629 skdud0629 requested a review from a team as a code owner July 16, 2024 01:25
@skdud0629 skdud0629 self-assigned this Jul 16, 2024
@skdud0629 skdud0629 changed the base branch from production to develop July 16, 2024 01:26
yunjaena
yunjaena requested changes Jul 16, 2024
View reviewed changes
Copy link
Contributor

@yunjaena yunjaena left a comment

Choose a reason for hiding this comment

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

수고했습니다 :) 최대한 viewModel 호출은 최상단에서 호출해주세요. viewModel이 종속되버리면 composable을 재활용하기 어려워집니다!

business/src/main/java/in/koreatech/business/feature/store/modifyinfo/ModifyInfoScreen.kt Outdated Show resolved Hide resolved
...ss/src/main/java/in/koreatech/business/feature/store/modifyinfo/ModifyOperatingTimeScreen.kt Outdated Show resolved Hide resolved
business/src/main/java/in/koreatech/business/feature/store/storedetail/MyStoreTopBar.kt Show resolved Hide resolved
domain/src/main/java/in/koreatech/koin/domain/usecase/business/GetOwnerShopInfoUseCase.kt Outdated Show resolved Hide resolved
yunjaena
yunjaena requested changes Jul 17, 2024
View reviewed changes
Copy link
Contributor

@yunjaena yunjaena left a comment

Choose a reason for hiding this comment

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

수고했습니다 :) 커멘트 확인해주세요.

...ss/src/main/java/in/koreatech/business/feature/store/modifyinfo/ModifyOperatingTimeScreen.kt Outdated Show resolved Hide resolved
yunjaena
yunjaena approved these changes Jul 17, 2024
View reviewed changes
Copy link
Contributor

@yunjaena yunjaena left a comment

Choose a reason for hiding this comment

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

LGTM 수고하셨습니다!

hsgo2430
hsgo2430 approved these changes Jul 17, 2024
View reviewed changes
Copy link
Contributor

@hsgo2430 hsgo2430 left a comment

Choose a reason for hiding this comment

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

완전 고생하셨어요! 이제 얼마 안남았으니 조금더 힘내요!

skdud0629 added 4 commits July 17, 2024 13:51
@skdud0629
Add itemsIndexed import
53ac06d
@skdud0629
Merge remote-tracking branch 'origin/develop' into feature/business/m…
fb5210d 
…oify-store-info

# Conflicts:
#	data/src/main/java/in/koreatech/koin/data/mapper/StoreMapper.kt
#	data/src/main/java/in/koreatech/koin/data/repository/StoreRepositoryImpl.kt
@skdud0629
Modify wrong code
11d68c0
@skdud0629
Delete annotation
c80eb07
@skdud0629 skdud0629 merged commit 6dab210 into develop Jul 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nayunjae nayunjae nayunjae left review comments

@hsgo2430 hsgo2430 hsgo2430 approved these changes

@yunjaena yunjaena yunjaena approved these changes

Assignees

@skdud0629 skdud0629

Labels
feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@skdud0629 @yunjaena @hsgo2430 @nayunjae