[CHORE] #82 : Resolve Conflict

app/build.gradle.kts

@@ -29,8 +29,10 @@ dependencies {
     implementation(project(":feature:auth"))
     implementation(project(":feature:notice"))
     implementation(project(":feature:survey"))
+    implementation(project(":feature:survey-check"))
     implementation(project(":feature:profile"))
     implementation(project(":feature:management"))
+    implementation(project(":feature:management-survey"))
     implementation(project(":feature:splash"))
     implementation(project(":core:designresource"))
     implementation(project(":core:designsystem"))

app/src/main/java/com/wap/wapp/MainActivity.kt

@@ -26,7 +26,7 @@ import com.wap.wapp.core.domain.usecase.auth.SignInUseCase
 import com.wap.wapp.feature.auth.signin.navigation.signInNavigationRoute
 import com.wap.wapp.feature.auth.signup.navigation.signUpNavigationRoute
 import com.wap.wapp.feature.management.registration.event.navigation.eventRegistrationNavigationRoute
-import com.wap.wapp.feature.management.registration.survey.navigation.surveyRegistrationNavigationRoute
+import com.wap.wapp.feature.management.survey.registration.navigation.surveyRegistrationNavigationRoute
 import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingNavigationRoute
 import com.wap.wapp.feature.splash.navigation.splashNavigationRoute
 import com.wap.wapp.navigation.TopLevelDestination

app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt

@@ -12,16 +12,14 @@ import com.wap.wapp.feature.auth.signin.navigation.navigateToSignIn
 import com.wap.wapp.feature.auth.signin.navigation.signInScreen
 import com.wap.wapp.feature.auth.signup.navigation.navigateToSignUp
 import com.wap.wapp.feature.auth.signup.navigation.signUpScreen
-import com.wap.wapp.feature.management.check.navigation.navigateToSurveyCheck
-import com.wap.wapp.feature.management.check.navigation.surveyCheckScreen
 import com.wap.wapp.feature.management.edit.event.navigation.eventEditScreen
 import com.wap.wapp.feature.management.edit.event.navigation.navigateToEventEdit
 import com.wap.wapp.feature.management.navigation.managementScreen
 import com.wap.wapp.feature.management.navigation.navigateToManagement
 import com.wap.wapp.feature.management.registration.event.navigation.eventRegistrationScreen
 import com.wap.wapp.feature.management.registration.event.navigation.navigateToEventRegistration
-import com.wap.wapp.feature.management.registration.survey.navigation.navigateToSurveyRegistration
-import com.wap.wapp.feature.management.registration.survey.navigation.surveyRegistrationScreen
+import com.wap.wapp.feature.management.survey.registration.navigation.navigateToSurveyRegistration
+import com.wap.wapp.feature.management.survey.registration.navigation.surveyRegistrationScreen
 import com.wap.wapp.feature.notice.navigation.navigateToNotice
 import com.wap.wapp.feature.notice.navigation.noticeScreen
 import com.wap.wapp.feature.profile.navigation.navigateToProfile
@@ -32,6 +30,8 @@ import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingNavi
 import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingScreen
 import com.wap.wapp.feature.splash.navigation.splashNavigationRoute
 import com.wap.wapp.feature.splash.navigation.splashScreen
+import com.wap.wapp.feature.survey.check.navigation.navigateToSurveyCheck
+import com.wap.wapp.feature.survey.check.navigation.surveyCheckScreen
 import com.wap.wapp.feature.survey.navigation.navigateToSurvey
 import com.wap.wapp.feature.survey.navigation.navigateToSurveyAnswer
 import com.wap.wapp.feature.survey.navigation.surveyNavGraph

core/domain/src/main/java/com/wap/wapp/core/domain/usecase/user/GetUserRoleUseCase.kt

@@ -9,8 +9,8 @@ class GetUserRoleUseCase @Inject constructor(
     private val userRepository: UserRepository,
     private val managementRepository: ManagementRepository,
 ) {
-    suspend operator fun invoke(): Result<UserRole> {
-        return runCatching {
+    suspend operator fun invoke(): Result<UserRole> =
+        runCatching {
             val userId = userRepository.getUserId()
                 .getOrElse { exception ->
                     if (exception is IllegalStateException) { // 회원이 아닌 경우
@@ -32,5 +32,4 @@ class GetUserRoleUseCase @Inject constructor(
                     },
                 )
         }
-    }
 }

core/model/src/main/java/com/wap/wapp/core/model/survey/SurveyForm.kt

@@ -2,6 +2,7 @@ package com.wap.wapp.core.model.survey
 
 import java.time.Duration
 import java.time.LocalDateTime
+import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 
 // 운영진이 등록하는 설문 모델
@@ -21,7 +22,8 @@ data class SurveyForm(
     )
 
     fun calculateDeadline(): String {
-        val currentDateTime = LocalDateTime.now()
+        val zoneId = ZoneId.of("Asia/Seoul")
+        val currentDateTime = LocalDateTime.now(zoneId)
         val duration = Duration.between(currentDateTime, deadline)
 
         if (duration.toMinutes() < 60) {
@@ -43,7 +45,8 @@ data class SurveyForm(
     }
 
     fun isAfterDeadline(): Boolean {
-        val currentDateTime = LocalDateTime.now()
+        val zoneId = ZoneId.of("Asia/Seoul")
+        val currentDateTime = LocalDateTime.now(zoneId)
         return deadline.isAfter(currentDateTime)
     }
 }

feature/management-survey/.gitignore

@@ -0,0 +1 @@
+/build

feature/management-survey/build.gradle.kts

@@ -0,0 +1,38 @@
+plugins {
+    id("com.wap.wapp.feature")
+    id("com.wap.wapp.hilt")
+}
+
+android {
+    namespace = "com.wap.wapp.feature.management.survey"
+
+    defaultConfig {
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":core:domain"))
+    implementation(project(":core:model"))
+    implementation(project(":core:designsystem"))
+    implementation(project(":core:designresource"))
+    implementation(project(":core:common"))
+
+    implementation(libs.bundles.androidx)
+    implementation(libs.material)
+
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.androidx.test.espresso)
+}

feature/management-survey/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

feature/management-survey/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>