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

๐Ÿ”€ :: (#280) Delete Feature Post Lecture #282

Merged
merged 26 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
106a3c4
๐Ÿ”ฅ:: LectureOpenScreen ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
203ba26
๐Ÿ”ฅ:: LectureDetailSettingDepartmentCard ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
5d29c10
๐Ÿ”ฅ:: AddLectureDatesButton ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
f90b96c
๐Ÿ”ฅ:: LectureDetailSettingInfoCard ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
129c7f2
๐Ÿ”ฅ:: LectureDetailSettingList ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
ce34f5e
๐Ÿ”ฅ:: LectureDetailSettingScreen ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
ac869a0
๐Ÿ”ฅ:: LectureDetailSettingTextField ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
5b43b1d
๐Ÿ”ฅ:: LectureDomainBottomSheet ์ค‘ LectureDetailSettingSearchBottomSheet ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
a84919a
๐Ÿ”ฅ:: LectureSettingTag ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
9604c66
๐Ÿ”ฅ:: LectureViewModel ๊ฒ€์ƒ‰/๊ฐ•์˜ ๊ฐœ์„ค ํ•จ์ˆ˜, ํ•„๋“œ ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
baf56a3
๐Ÿ”ฅ:: LectureNavigation ์„ธ๋ถ€ ์„ค์ •, ๊ฐ•์˜ ๊ฐœ์„ค Screen Navigation ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
db91c84
๐Ÿ”ฅ:: LectureListScreen ๊ฐ•์˜ ๊ฐœ์„ค ๋ฒ„ํŠผ, ์ด๋ฒคํŠธ ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
f5efb37
๐Ÿ”ฅ:: OpenLectureRequest ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
fc1320a
๐Ÿ”ฅ:: Search API Response ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
77dca38
๐Ÿ”ฅ:: LectureAPI ๊ฒ€์ƒ‰, ๊ฐœ์„ค ๊ธฐ๋Šฅ ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
84fbe54
๐Ÿ”ฅ:: LectureDataSource ๊ฒ€์ƒ‰, ๊ฐœ์„ค ๊ธฐ๋Šฅ ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
f58265a
๐Ÿ”ฅ:: Search ๊ด€๋ จ API Entity ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
030d4b4
๐Ÿ”ฅ:: ๊ฐ•์˜ ๊ฐœ์„ค Param ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
2736959
๐Ÿ”ฅ:: Search API ๊ด€๋ จ UseCase ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
19d12a3
๐Ÿ”ฅ:: ๊ฐ•์˜ ๊ฐœ์„ค UseCase ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
887bcf0
๐Ÿ”ฅ:: ๊ฐ•์˜ ๊ฐœ์„ค Mapper ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
a0507df
๐Ÿ”ฅ:: Search ๊ด€๋ จ API Mapper ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
bd03f1f
๐Ÿ”ฅ:: LectureRepository ๊ฐ•์˜ ๊ฐœ์„ค, Search ๊ธฐ๋Šฅ ์‚ญ์ œ
Chaejongin12 Aug 29, 2024
3da5723
๐Ÿ”ฅ:: BitgoeulNavHost ๊ฐ•์˜ ๊ฐœ์„ค Screen, ๊ฐ•์˜ ์„ธ๋ถ€ ์„ค์ • Screen ๋“ฑ๋ก ํ•ด์ œ
Chaejongin12 Aug 29, 2024
660a6e5
Merge branch 'develop' of https://github.com/GSM-MSG/Bitgoeul-Androidโ€ฆ
Chaejongin12 Aug 29, 2024
4a3af7a
:green_heart: :: PatchLectureUseCase ์ฃผ์„์ฒ˜๋ฆฌ
Chaejongin12 Aug 29, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,10 @@ import com.msg.club.navigation.clubDetailScreen
import com.msg.club.navigation.clubScreen
import com.msg.club.navigation.navigateToClubDetailPage
import com.msg.lecture.navigation.lectureDetailScreen
import com.msg.lecture.navigation.lectureDetailSettingScreen
import com.msg.lecture.navigation.lectureListScreen
import com.msg.lecture.navigation.lectureOpenScreen
import com.msg.lecture.navigation.lectureTakingStudentListScreen
import com.msg.lecture.navigation.navigateToLecture
import com.msg.lecture.navigation.navigateToLectureDetail
import com.msg.lecture.navigation.navigateToLectureDetailSetting
import com.msg.lecture.navigation.navigateToLectureOpen
import com.msg.lecture.navigation.navigateToLectureTakingStudentList
import com.msg.post.navigation.navigateToPostAddPage
import com.msg.post.navigation.navigateToPostDetailPage
Expand Down Expand Up @@ -114,7 +110,6 @@ fun BitgoeulNavHost(
onApplyClicked = navController::navigateUp
)
lectureListScreen(
onOpenClicked = navController::navigateToLectureOpen,
onItemClicked = navController::navigateToLectureDetail,
)
lectureDetailScreen(
Expand All @@ -124,15 +119,6 @@ fun BitgoeulNavHost(
lectureTakingStudentListScreen(
onBackClicked = navController::navigateUp,
)
lectureOpenScreen(
onActionClicked = navController::navigateUp,
onSettingClicked = navController::navigateToLectureDetailSetting,
onBackClicked = navController::navigateUp,
)
lectureDetailSettingScreen(
onCloseClicked = navController::navigateUp,
onApplyClicked = navController::navigateUp,
)
myPageScreen(
onPasswordChangeClicked = navController::navigateToPasswordChange,
onWithdrawClicked = navController::navigateToLogin,
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,16 @@ import com.msg.model.entity.lecture.DownloadExcelFileEntity
import com.msg.model.entity.lecture.GetLectureSignUpHistoryEntity
import com.msg.model.entity.lecture.GetTakingLectureStudentListEntity
import com.msg.model.entity.lecture.LectureListEntity
import com.msg.model.entity.lecture.SearchDepartmentEntity
import com.msg.model.entity.lecture.SearchDivisionEntity
import com.msg.model.entity.lecture.SearchLineEntity
import com.msg.model.entity.lecture.SearchProfessorEntity
import com.msg.model.param.lecture.OpenLectureParam
// import com.msg.model.param.lecture.OpenLectureParam
import kotlinx.coroutines.flow.Flow
import java.util.UUID

interface LectureRepository {
fun openLecture(body: OpenLectureParam): Flow<Unit>
fun getLectureList(page: Int, size: Int, type: String?): Flow<LectureListEntity>
fun getDetailLecture(id: UUID): Flow<DetailLectureEntity>
fun patchLecture(id: UUID, body: OpenLectureParam): Flow<Unit>
// fun patchLecture(id: UUID, body: OpenLectureParam): Flow<Unit>
fun lectureApplication(id: UUID): Flow<Unit>
fun lectureApplicationCancel(id: UUID): Flow<Unit>
fun searchProfessor(keyword: String): Flow<SearchProfessorEntity>
fun searchLine(keyword: String, division: String): Flow<SearchLineEntity>
fun searchDepartment(keyword: String): Flow<SearchDepartmentEntity>
fun searchDivision(keyword: String): Flow<SearchDivisionEntity>
fun getLectureSignUpHistory(studentId: UUID): Flow<GetLectureSignUpHistoryEntity>
fun getTakingLectureStudentList(id: UUID): Flow<GetTakingLectureStudentListEntity>
fun editLectureCourseCompletionStatus(id: UUID, studentId: UUID, isComplete: Boolean): Flow<Unit>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package com.msg.data.repository.lecture

import com.msg.data.mapper.lecture.toEntity
import com.msg.data.mapper.lecture.toRequest
// import com.msg.data.mapper.lecture.toRequest
import com.msg.model.entity.lecture.DetailLectureEntity
import com.msg.model.entity.lecture.DownloadExcelFileEntity
import com.msg.model.entity.lecture.GetLectureSignUpHistoryEntity
import com.msg.model.entity.lecture.GetTakingLectureStudentListEntity
import com.msg.model.entity.lecture.LectureListEntity
import com.msg.model.entity.lecture.SearchDepartmentEntity
import com.msg.model.entity.lecture.SearchDivisionEntity
import com.msg.model.entity.lecture.SearchLineEntity
import com.msg.model.entity.lecture.SearchProfessorEntity
import com.msg.model.param.lecture.OpenLectureParam
// import com.msg.model.param.lecture.OpenLectureParam
import com.msg.network.datasource.lecture.LectureDataSource
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.transform
Expand All @@ -21,12 +17,6 @@ import javax.inject.Inject
class LectureRepositoryImpl @Inject constructor(
private val lectureDataSource: LectureDataSource,
) : LectureRepository {
override fun openLecture(body: OpenLectureParam): Flow<Unit> {
return lectureDataSource.openLecture(
body = body.toRequest()
)
}

override fun getLectureList(
page: Int,
size: Int,
Expand All @@ -49,12 +39,12 @@ class LectureRepositoryImpl @Inject constructor(
}
}

override fun patchLecture(id: UUID, body: OpenLectureParam): Flow<Unit> {
return lectureDataSource.patchLecture(
id = id,
body = body.toRequest()
)
}
// override fun patchLecture(id: UUID, body: OpenLectureParam): Flow<Unit> {
// return lectureDataSource.patchLecture(
// id = id,
// body = body.toRequest()
// )
// }

override fun lectureApplication(id: UUID): Flow<Unit> {
return lectureDataSource.lectureApplication(
Expand All @@ -68,39 +58,6 @@ class LectureRepositoryImpl @Inject constructor(
)
}

override fun searchProfessor(keyword: String): Flow<SearchProfessorEntity> {
return lectureDataSource.searchProfessor(
keyword = keyword
).transform { response ->
response.toEntity()
}
}

override fun searchLine(keyword: String, division: String): Flow<SearchLineEntity> {
return lectureDataSource.searchLine(
keyword = keyword,
division = division
).transform { response ->
response.toEntity()
}
}

override fun searchDepartment(keyword: String): Flow<SearchDepartmentEntity> {
return lectureDataSource.searchDepartment(
keyword = keyword
).transform { response ->
response.toEntity()
}
}

override fun searchDivision(keyword: String): Flow<SearchDivisionEntity> {
return lectureDataSource.searchDivision(
keyword = keyword
).transform { response ->
response.toEntity()
}
}

override fun getLectureSignUpHistory(studentId: UUID): Flow<GetLectureSignUpHistoryEntity> {
return lectureDataSource.getLectureSignUpHistory(studentId)
.transform { response ->
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.msg.domain.usecase.lecture

import com.msg.data.repository.lecture.LectureRepository
import com.msg.model.param.lecture.OpenLectureParam
import java.util.UUID
import javax.inject.Inject

class PatchLecture @Inject constructor(
private val lectureRepository: LectureRepository
) {
operator fun invoke(id: UUID, body: OpenLectureParam) = runCatching {
lectureRepository.patchLecture(id = id, body = body)
}
}
//import com.msg.data.repository.lecture.LectureRepository
//import com.msg.model.param.lecture.OpenLectureParam
//import java.util.UUID
//import javax.inject.Inject
//
//class PatchLecture @Inject constructor(
// private val lectureRepository: LectureRepository
//) {
// operator fun invoke(id: UUID, body: OpenLectureParam) = runCatching {
// lectureRepository.patchLecture(id = id, body = body)
// }
//}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading