Merge pull request #90 from snuhcs-course/dev

Merge Dev into Main

backend/post/views.py

@@ -207,7 +207,7 @@ class PostRecommendView(APIView):
     def get(self, request):
         user = request.user
         today = date.today()
-        posts = Post.objects.filter(recommend_users=user,event_durations__event_day__gte=today).order_by("-recommend__score")
+        posts = Post.objects.filter(recommend_users=user,event_durations__event_day__gte=today).order_by("-recommend__score").distinct()
         # scores = Recommend.objects.filter(user=request.user).values('score')
         serializer = PostRecommendSerializer(posts, many=True, context={'request': request})
         return Response(serializer.data, status=200)

frontend/app/src/main/java/com/example/haengsha/model/dataSource/AppContainer.kt

@@ -18,7 +18,7 @@ interface AppContainer {
 
 class HaengshaAppContainer : AppContainer {
     private val baseUrl = "http://ec2-13-209-8-183.ap-northeast-2.compute.amazonaws.com:8080/"
-    // private val baseUrl = "http://10.150.196.98:8000"
+
     private val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
         level = HttpLoggingInterceptor.Level.BODY
     }

frontend/app/src/main/java/com/example/haengsha/model/uiState/board/BoardApiUiState.kt

@@ -8,40 +8,41 @@ sealed interface BoardListUiState {
         val boardList: List<BoardListResponse>
     ) : BoardListUiState
 
-    object HttpError : BoardListUiState
-    object NetworkError : BoardListUiState
-    object Error : BoardListUiState
-    object Loading : BoardListUiState
+    data object HttpError : BoardListUiState
+    data object NetworkError : BoardListUiState
+    data object Error : BoardListUiState
+    data object Loading : BoardListUiState
+    data object Default : BoardListUiState
 }
 
 sealed interface BoardFavoriteUiState {
     data class BoardListResult(
         val boardList: List<BoardListResponse>
     ) : BoardFavoriteUiState
 
-    object HttpError : BoardFavoriteUiState
-    object NetworkError : BoardFavoriteUiState
-    object Error : BoardFavoriteUiState
-    object Loading : BoardFavoriteUiState
+    data object HttpError : BoardFavoriteUiState
+    data object NetworkError : BoardFavoriteUiState
+    data object Error : BoardFavoriteUiState
+    data object Loading : BoardFavoriteUiState
 }
 
 sealed interface BoardDetailUiState {
     data class BoardDetailResult(
         val boardDetail: BoardDetailResponse
     ) : BoardDetailUiState
 
-    object HttpError : BoardDetailUiState
-    object NetworkError : BoardDetailUiState
-    object Error : BoardDetailUiState
-    object Loading : BoardDetailUiState
+    data object HttpError : BoardDetailUiState
+    data object NetworkError : BoardDetailUiState
+    data object Error : BoardDetailUiState
+    data object Loading : BoardDetailUiState
 }
 
 sealed interface BoardPostApiUiState {
-    object Success : BoardPostApiUiState
-    object HttpError : BoardPostApiUiState
-    object NetworkError : BoardPostApiUiState
-    object Error : BoardPostApiUiState
-    object Loading : BoardPostApiUiState
+    data object Success : BoardPostApiUiState
+    data object HttpError : BoardPostApiUiState
+    data object NetworkError : BoardPostApiUiState
+    data object Error : BoardPostApiUiState
+    data object Loading : BoardPostApiUiState
 }
 
 sealed interface PatchLikeFavoriteUiState {
@@ -52,8 +53,8 @@ sealed interface PatchLikeFavoriteUiState {
         val isFavorite: Boolean
     ) : PatchLikeFavoriteUiState
 
-    object HttpError : PatchLikeFavoriteUiState
-    object NetworkError : PatchLikeFavoriteUiState
-    object Error : PatchLikeFavoriteUiState
-    object Loading : PatchLikeFavoriteUiState
+    data object HttpError : PatchLikeFavoriteUiState
+    data object NetworkError : PatchLikeFavoriteUiState
+    data object Error : PatchLikeFavoriteUiState
+    data object Loading : PatchLikeFavoriteUiState
 }

frontend/app/src/main/java/com/example/haengsha/model/uiState/home/HomeApiUiState.kt

@@ -1,9 +1,15 @@
 package com.example.haengsha.model.uiState.home
 
+import com.example.haengsha.model.network.dataModel.EventResponse
+
 sealed interface HomeApiUiState {
-    object Success : HomeApiUiState
-    object HttpError : HomeApiUiState
-    object NetworkError : HomeApiUiState
-    object Error : HomeApiUiState
-    object Loading : HomeApiUiState
+    data class Success(
+        val festivalResponse: List<EventResponse>?,
+        val academicResponse: List<EventResponse>?
+    ) : HomeApiUiState
+
+    data object HttpError : HomeApiUiState
+    data object NetworkError : HomeApiUiState
+    data object Error : HomeApiUiState
+    data object Loading : HomeApiUiState
 }

frontend/app/src/main/java/com/example/haengsha/model/uiState/home/RecommendationApiUiState.kt

@@ -7,8 +7,8 @@ sealed interface RecommendationApiUiState {
         val recommendationList: List<RecommendResponse>
     ) : RecommendationApiUiState
 
-    object HttpError : RecommendationApiUiState
-    object NetworkError : RecommendationApiUiState
-    object Error : RecommendationApiUiState
-    object Loading : RecommendationApiUiState
+    data object HttpError : RecommendationApiUiState
+    data object NetworkError : RecommendationApiUiState
+    data object Error : RecommendationApiUiState
+    data object Loading : RecommendationApiUiState
 }

frontend/app/src/main/java/com/example/haengsha/model/viewModel/board/BoardApiViewModel.kt

@@ -164,10 +164,14 @@ class BoardApiViewModel(private val boardDataRepository: BoardDataRepository) :
         patchLikeFavoriteUiState = PatchLikeFavoriteUiState.Loading
     }
 
-    fun resetBoardListUiState() {
+    fun resetBoardListUiStateToLoading() {
         boardListUiState = BoardListUiState.Loading
     }
 
+    fun resetBoardListUiStateToDefault() {
+        boardListUiState = BoardListUiState.Default
+    }
+
     fun resetBoardPostApiUiState() {
         boardPostApiUiState = BoardPostApiUiState.Loading
     }

frontend/app/src/main/java/com/example/haengsha/model/viewModel/board/BoardViewModel.kt

@@ -17,10 +17,28 @@ class BoardViewModel : ViewModel() {
     private val _eventId = MutableStateFlow(0)
     val eventId = _eventId.asStateFlow()
 
+    private val _input = MutableStateFlow("")
+    val input = _input.asStateFlow()
+
+    private val _isSearched = MutableStateFlow(false)
+    val isSearched = _isSearched.asStateFlow()
+
     fun updateEventId(newEventId: Int) {
         _eventId.value = newEventId
     }
 
+    fun updateInput(newInput: String) {
+        _input.value = newInput
+    }
+
+    fun setIsSearchedTrue() {
+        _isSearched.value = true
+    }
+
+    fun setIsSearchedFalse() {
+        _isSearched.value = false
+    }
+
     var isError = false
 
     fun isError() {