Revert "[ALL] release: v1.2.0 (#608) (#620)"

This reverts commit a6bcaa9.

README.md

@@ -1,73 +1 @@
-# 페스타고, 대학 축제를 더욱 즐겁게!
-> 대학 축제 줄서기 및 축제 정보 제공 서비스 "페스타고"
-
-![](https://github.com/woowacourse-teams/2023-festa-go/assets/71129059/55f0d73b-c032-4c15-9cdf-40a560af948f)
-
-다들 즐거워 하는 대학 축제이지만, 한 가지 걱정되는 점이 있습니다. 바로 ‘줄 서기’입니다. 티켓팅과 예매를 위한 지루한 줄서기 과정은 축제의 재미를 반감시키는 요인입니다.
-
-페스타고는 이러한 문제를 해결하여, 우리 모두가 대학 축제를 더 편리하게 즐기기 위해 만들어졌습니다.
-
-페스타고를 통해 티켓을 예매하기 위해 불편한 줄 서기 과정을 거칠 필요 없이 온라인으로 티켓을 예매하고, 복잡한 절차 없이 스마트폰의 QR 코드만으로 입장을 할 수 있습니다.
-
-<img width="1192" alt="image" src="https://github.com/woowacourse-teams/2023-festa-go/assets/71129059/8e761c81-6066-4f93-89af-b9d2d22eb577">
-
-<br/>
-<br/>
-
-**▷ 📲 다운로드 |** [PlayStore](https://play.google.com/store/apps/details?id=com.festago.festago)
-
-**▷ 📝 팀블로그 |** [Festago 팀블로그](https://festago.github.io/)
-
-**▷ 📧 연락처 |** [email protected]
-
-## Android
-<div align="center">
-  <h3>프로젝트 아키텍처</h3>
-  <img width="955" src="https://github.com/woowacourse-teams/2023-festa-go/assets/67777523/2fc5e26f-c628-41fe-b2d3-5b74da794fdc">
-</div>
-
-<div align="center">
-  <h3>기술 스택</h3>
-<img width="500" src="https://github.com/woowacourse-teams/2023-festa-go/assets/67777523/90c3eec2-ada6-4c83-a915-0ab3754ab40c">
-</div>
-
-## Backend
-<div align="center">
-  <h3>백엔드 인프라 아키텍처</h3>
-  <img width="800" src="https://github.com/woowacourse-teams/2023-festa-go/assets/103228463/aad084a6-c1ca-41fa-89c0-f2d2371e59cc">
-</div>
-
-
-<div align="center">
-  <h3>기술 스택</h3>
-  <img src="https://img.shields.io/badge/Java17-000000?style=flat-square&logo=java&color=F40D12">
-  <img src="https://img.shields.io/badge/Spring_Boot_3-0?style=flat-square&logo=spring-boot&logoColor=white&color=%236DB33F">
-  <img src="https://img.shields.io/badge/MySQL_8-0?style=flat-square&logo=mysql&logoColor=white&color=4479A1">
-  <img src="https://img.shields.io/badge/Nginx-0?style=flat-square&logo=nginx&logoColor=white&color=009639">
-  <img src="https://img.shields.io/badge/Hibernate-0?style=flat-square&logo=hibernate&logoColor=white&color=%2359666C">
-  <img src="https://img.shields.io/badge/Amazon_EC2-0?style=flat-square&logo=amazon-ec2&logoColor=white&color=%23FF9900">
-  <img src="https://img.shields.io/badge/Flyway-0?style=flat-square&logo=flyway&color=%23CC0200">
-  <br/>
-  <img src="https://img.shields.io/badge/Amazon_CloudWatch-0?style=flat-square&logo=amazon-cloudwatch&logoColor=white&color=%23FF4F8B">
-  <img src="https://img.shields.io/badge/OAuth2-0?style=flat-square&logo=oauth2&logoColor=white&color=%23000000">
-  <img src="https://img.shields.io/badge/Gradle-0?style=flat-square&logo=gradle&logoColor=white&color=%2302303A">
-  <img src="https://img.shields.io/badge/Swagger-0?style=flat-square&logo=Swagger&logoColor=white&color=%2385EA2D">
-  <img src="https://img.shields.io/badge/GitHub%20Actions-0?style=flat-square&logo=GitHub%20Actions&logoColor=white&color=%232088FF">
-  <img src="https://img.shields.io/badge/JUnit5-0?style=JUnit5-square&logo=junit5&logoColor=white&color=%2325A162">
-  <img src="https://img.shields.io/badge/Jenkins-0?style=flat-square&logo=Jenkins&logoColor=white&color=%23D24939">
-</div>
-<br/>
-
-## 🎉 축제 스태프를 소개합니다
-
-|BackEnd|BackEnd|BackEnd|BackEnd|Android|Android|Android|
-|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
-|![](https://avatars.githubusercontent.com/u/103228463?v=4&size=100)|![](https://avatars.githubusercontent.com/u/116627736?v=4&size=100)|![](https://avatars.githubusercontent.com/u/71129059?v=4&size=100)|![](https://avatars.githubusercontent.com/u/100915276?v=4&size=100)|![](https://avatars.githubusercontent.com/u/108349655?v=4&size=100)|![](https://avatars.githubusercontent.com/u/67777523?v=4&size=100)|![](https://avatars.githubusercontent.com/u/37167652?v=4&size=100)|
-|[푸우](https://github.com/BGuga)|[글렌](https://github.com/seokjin8678)|[애쉬](https://github.com/xxeol2)|[오리](https://github.com/carsago)|[베르](https://github.com/SeongHoonC)|[해시](https://github.com/EmilyCh0)|[아크](https://github.com/re4rk)|
-
-<br>
-
-## ⛔️ 공연 관람시 주의사항
-> 페스타고 팀의 그라운드 룰을 소개합니다.
-
-<img width="787" alt="image" src="https://github.com/woowacourse-teams/2023-festa-go/assets/71129059/85c4d4d0-24fa-4602-9eed-a9a2e4a6482e">
+# 2023-festa-go

android/festago/app/build.gradle.kts

@@ -20,8 +20,8 @@ android {
         applicationId = "com.festago.festago"
         minSdk = 28
         targetSdk = 34
-        versionCode = 7
-        versionName = "1.2.0"
+        versionCode = 3
+        versionName = "1.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

android/festago/app/src/main/java/com/festago/festago/data/repository/FestivalDefaultRepository.kt

@@ -4,18 +4,16 @@ import com.festago.festago.data.service.FestivalRetrofitService
 import com.festago.festago.data.util.onSuccessOrCatch
 import com.festago.festago.data.util.runCatchingResponse
 import com.festago.festago.model.Festival
-import com.festago.festago.model.FestivalFilter
 import com.festago.festago.model.Reservation
 import com.festago.festago.repository.FestivalRepository
 import javax.inject.Inject
 
 class FestivalDefaultRepository @Inject constructor(
     private val festivalRetrofitService: FestivalRetrofitService,
 ) : FestivalRepository {
-    override suspend fun loadFestivals(festivalFilter: FestivalFilter): Result<List<Festival>> =
-        runCatchingResponse {
-            festivalRetrofitService.getFestivals(festivalFilter.name)
-        }.onSuccessOrCatch { it.toDomain() }
+    override suspend fun loadFestivals(): Result<List<Festival>> =
+        runCatchingResponse { festivalRetrofitService.getFestivals() }
+            .onSuccessOrCatch { it.toDomain() }
 
     override suspend fun loadFestivalDetail(festivalId: Long): Result<Reservation> =
         runCatchingResponse { festivalRetrofitService.getFestivalDetail(festivalId) }

android/festago/app/src/main/java/com/festago/festago/data/repository/TicketDefaultRepository.kt

@@ -4,7 +4,6 @@ import com.festago.festago.data.dto.ReservedTicketRequest
 import com.festago.festago.data.service.TicketRetrofitService
 import com.festago.festago.data.util.onSuccessOrCatch
 import com.festago.festago.data.util.runCatchingResponse
-import com.festago.festago.model.ErrorCode
 import com.festago.festago.model.ReservedTicket
 import com.festago.festago.model.Ticket
 import com.festago.festago.model.TicketCode
@@ -32,16 +31,9 @@ class TicketDefaultRepository @Inject constructor(
             .onSuccessOrCatch { it.toDomain() }
 
     override suspend fun reserveTicket(ticketId: Int): Result<ReservedTicket> =
-        runCatchingResponse { ticketRetrofitService.postReserveTicket(ReservedTicketRequest(ticketId)) }
-            .onSuccessOrCatch { it.toDomain() }
-            .onFailure { throwable ->
-                val message = throwable.message ?: "ERROR_UNKNOWN"
-                val error: Throwable = when {
-                    "NEED_STUDENT_VERIFICATION" in message -> ErrorCode.NEED_STUDENT_VERIFICATION()
-                    "RESERVE_TICKET_OVER_AMOUNT" in message -> ErrorCode.RESERVE_TICKET_OVER_AMOUNT()
-                    "TICKET_SOLD_OUT" in message -> ErrorCode.TICKET_SOLD_OUT()
-                    else -> throwable
-                }
-                return Result.failure(error)
-            }
+        runCatchingResponse {
+            ticketRetrofitService.postReserveTicket(
+                ReservedTicketRequest(ticketId),
+            )
+        }.onSuccessOrCatch { it.toDomain() }
 }

android/festago/app/src/main/java/com/festago/festago/data/service/FestivalRetrofitService.kt

@@ -5,13 +5,10 @@ import com.festago.festago.data.dto.ReservationFestivalResponse
 import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Path
-import retrofit2.http.Query
 
 interface FestivalRetrofitService {
     @GET("/festivals")
-    suspend fun getFestivals(
-        @Query("festivalFilter") festivalFilter: String,
-    ): Response<FestivalsResponse>
+    suspend fun getFestivals(): Response<FestivalsResponse>
 
     @GET("/festivals/{festivalId}")
     suspend fun getFestivalDetail(

android/festago/app/src/main/java/com/festago/festago/presentation/ui/home/HomeActivity.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
-import androidx.activity.addCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
@@ -38,7 +37,6 @@ class HomeActivity : AppCompatActivity() {
         initView()
         initObserve()
         initResultLauncher()
-        initBackPressedDispatcher()
     }
 
     private fun initResultLauncher() {
@@ -131,22 +129,6 @@ class HomeActivity : AppCompatActivity() {
         resultLauncher.launch(SignInActivity.getIntent(this))
     }
 
-    private fun initBackPressedDispatcher() {
-        var backPressedTime = START_BACK_PRESSED_TIME
-        onBackPressedDispatcher.addCallback {
-            if ((System.currentTimeMillis() - backPressedTime) > FINISH_BACK_PRESSED_TIME) {
-                backPressedTime = System.currentTimeMillis()
-                Toast.makeText(
-                    this@HomeActivity,
-                    getString(R.string.home_back_pressed),
-                    Toast.LENGTH_SHORT,
-                ).show()
-            } else {
-                finish()
-            }
-        }
-    }
-
     private inline fun <reified T : Fragment> changeFragment() {
         val tag = T::class.java.name
         val fragmentTransaction = supportFragmentManager.beginTransaction()
@@ -168,8 +150,6 @@ class HomeActivity : AppCompatActivity() {
     }
 
     companion object {
-        private const val START_BACK_PRESSED_TIME = 0L
-        private const val FINISH_BACK_PRESSED_TIME = 3000L
         fun getIntent(context: Context): Intent {
             return Intent(context, HomeActivity::class.java)
         }

android/festago/app/src/main/java/com/festago/festago/presentation/ui/home/festivallist/FestivalListFragment.kt

@@ -9,7 +9,6 @@ import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import com.festago.festago.R
 import com.festago.festago.databinding.FragmentFestivalListBinding
-import com.festago.festago.model.FestivalFilter
 import com.festago.festago.presentation.ui.home.ticketlist.TicketListFragment
 import com.festago.festago.presentation.ui.ticketreserve.TicketReserveActivity
 import com.festago.festago.presentation.util.repeatOnStarted
@@ -60,15 +59,6 @@ class FestivalListFragment : Fragment(R.layout.fragment_festival_list) {
         adapter = FestivalListAdapter()
         binding.rvFestivalList.adapter = adapter
 
-        initFestivalListSpanSize()
-        initRefresh()
-        initFestivalFilters()
-        if (vm.uiState.value is FestivalListUiState.Loading) {
-            loadFestivalsBy(binding.cgFilterOption.checkedChipId)
-        }
-    }
-
-    private fun initFestivalListSpanSize() {
         binding.rvFestivalList.layoutManager.apply {
             if (this is GridLayoutManager) {
                 val spanSize = (resources.displayMetrics.widthPixels.dp / 160)
@@ -79,29 +69,15 @@ class FestivalListFragment : Fragment(R.layout.fragment_festival_list) {
                 }
             }
         }
-    }
 
-    private fun initRefresh() {
+        vm.loadFestivals()
+
         binding.srlFestivalList.setOnRefreshListener {
-            loadFestivalsBy(binding.cgFilterOption.checkedChipId)
+            vm.loadFestivals()
             binding.srlFestivalList.isRefreshing = false
         }
     }
 
-    private fun initFestivalFilters() {
-        binding.cgFilterOption.setOnCheckedStateChangeListener { group, _ ->
-            loadFestivalsBy(checkedChipId = group.checkedChipId)
-        }
-    }
-
-    private fun loadFestivalsBy(checkedChipId: Int) {
-        when (checkedChipId) {
-            R.id.chipProgress -> vm.loadFestivals(FestivalFilter.PROGRESS)
-            R.id.chipPlanned -> vm.loadFestivals(FestivalFilter.PLANNED)
-            R.id.chipEnd -> vm.loadFestivals(FestivalFilter.END)
-        }
-    }
-
     private fun updateUi(uiState: FestivalListUiState) {
         when (uiState) {
             is FestivalListUiState.Loading,

android/festago/app/src/main/java/com/festago/festago/presentation/ui/home/festivallist/FestivalListUiState.kt

@@ -4,7 +4,7 @@ sealed interface FestivalListUiState {
     object Loading : FestivalListUiState
 
     data class Success(
-        val festivals: List<FestivalItemUiState>,
+        val festivals: List<FestivalItemUiState>
     ) : FestivalListUiState {
         val hasFestival get() = festivals.isNotEmpty()
     }

android/festago/app/src/main/java/com/festago/festago/presentation/ui/home/festivallist/FestivalListViewModel.kt

@@ -4,7 +4,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.festago.festago.analytics.AnalyticsHelper
 import com.festago.festago.analytics.logNetworkFailure
-import com.festago.festago.model.FestivalFilter
 import com.festago.festago.presentation.ui.home.festivallist.FestivalListEvent.ShowTicketReserve
 import com.festago.festago.repository.FestivalRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -29,9 +28,9 @@ class FestivalListViewModel @Inject constructor(
     private val _event = MutableSharedFlow<FestivalListEvent>()
     val event: SharedFlow<FestivalListEvent> = _event.asSharedFlow()
 
-    fun loadFestivals(festivalFilter: FestivalFilter) {
+    fun loadFestivals() {
         viewModelScope.launch {
-            festivalRepository.loadFestivals(festivalFilter)
+            festivalRepository.loadFestivals()
                 .onSuccess {
                     _uiState.value = FestivalListUiState.Success(
                         festivals = it.map { festival ->

android/festago/app/src/main/java/com/festago/festago/presentation/ui/studentverification/StudentVerificationActivity.kt

@@ -10,7 +10,6 @@ import com.festago.festago.databinding.ActivityStudentVerificationBinding
 import com.festago.festago.presentation.ui.customview.OkDialogFragment
 import com.festago.festago.presentation.ui.home.HomeActivity
 import com.festago.festago.presentation.util.repeatOnStarted
-import com.festago.festago.presentation.util.setOnSingleClickListener
 import dagger.hilt.android.AndroidEntryPoint
 import java.time.LocalTime
 import java.time.format.DateTimeFormatter
@@ -44,7 +43,7 @@ class StudentVerificationActivity : AppCompatActivity() {
     }
 
     private fun initRequestVerificationCodeBtn(schoolId: Long) {
-        binding.btnRequestVerificationCode.setOnSingleClickListener {
+        binding.btnRequestVerificationCode.setOnClickListener {
             vm.sendVerificationCode(binding.tieUserName.text.toString(), schoolId)
         }
     }

android/festago/app/src/main/java/com/festago/festago/presentation/ui/ticketreserve/TicketReserveActivity.kt

@@ -8,7 +8,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.ConcatAdapter
 import com.festago.festago.R
 import com.festago.festago.databinding.ActivityTicketReserveBinding
-import com.festago.festago.model.ErrorCode
 import com.festago.festago.model.ReservationTicket
 import com.festago.festago.model.ReservedTicket
 import com.festago.festago.presentation.ui.customview.OkDialogFragment
@@ -76,7 +75,7 @@ class TicketReserveActivity : AppCompatActivity() {
         )
 
         is ReserveTicketSuccess -> handleReserveTicketSuccess(event.reservedTicket)
-        is ReserveTicketFailed -> handleReserveTicketFailed(event.errorCode)
+        is ReserveTicketFailed -> handleReserveTicketFailed()
         is ShowSignIn -> handleShowSignIn()
     }
 
@@ -114,14 +113,8 @@ class TicketReserveActivity : AppCompatActivity() {
         finish()
     }
 
-    private fun handleReserveTicketFailed(errorCode: ErrorCode) {
-        val message: String = when (errorCode) {
-            is ErrorCode.TICKET_SOLD_OUT -> getString(R.string.ticket_reserve_dialog_sold_out)
-            is ErrorCode.RESERVE_TICKET_OVER_AMOUNT -> getString(R.string.ticket_reserve_dialog_over_amount)
-            is ErrorCode.NEED_STUDENT_VERIFICATION -> getString(R.string.ticket_reserve_dialog_need_student_verification)
-            is ErrorCode.UNKNOWN -> getString(R.string.ticket_reserve_dialog_unknown)
-        }
-        OkDialogFragment.newInstance(message)
+    private fun handleReserveTicketFailed() {
+        OkDialogFragment.newInstance("예약에 실패하였습니다.")
             .show(supportFragmentManager, OkDialogFragment::class.java.name)
     }
 

android/festago/app/src/main/java/com/festago/festago/presentation/ui/ticketreserve/TicketReserveEvent.kt

@@ -1,6 +1,5 @@
 package com.festago.festago.presentation.ui.ticketreserve
 
-import com.festago.festago.model.ErrorCode
 import com.festago.festago.model.ReservationTicket
 import com.festago.festago.model.ReservedTicket
 import java.time.LocalDateTime
@@ -12,6 +11,6 @@ sealed interface TicketReserveEvent {
     ) : TicketReserveEvent
 
     class ReserveTicketSuccess(val reservedTicket: ReservedTicket) : TicketReserveEvent
-    class ReserveTicketFailed(val errorCode: ErrorCode) : TicketReserveEvent
+    object ReserveTicketFailed : TicketReserveEvent
     object ShowSignIn : TicketReserveEvent
 }