Merge branch 'dev' into feat/#969

woowacourse-teams · May 15, 2024 · 8ad0d77 · 8ad0d77
2 parents c752ca4 + a5bf7c3
commit 8ad0d77
Show file tree

Hide file tree

Showing 80 changed files with 1,016 additions and 282 deletions.
diff --git a/android/festago/app/build.gradle.kts b/android/festago/app/build.gradle.kts
@@ -16,8 +16,8 @@ android {
         applicationId = "com.festago.festago"
         minSdk = 28
         targetSdk = 34
-        versionCode = 11
-        versionName = "2.0.2"
+        versionCode = 12
+        versionName = "2.0.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/...c/main/java/com/festago/festago/presentation/ui/home/festivallist/FestivalListFragment.kt b/...c/main/java/com/festago/festago/presentation/ui/home/festivallist/FestivalListFragment.kt
@@ -160,7 +160,6 @@ class FestivalListFragment : Fragment() {
         val schoolRegions = SchoolRegion.values().map {
             SchoolRegionUiState(it, it == this.schoolRegion)
         }
-        val dialog = createRegionDialog(schoolRegions)
 
         return mutableListOf<Any>().apply {
             if (popularFestivalUiState.festivals.isNotEmpty()) {
@@ -172,10 +171,7 @@ class FestivalListFragment : Fragment() {
                     selectedRegion = schoolRegion,
                     onFilterSelected = { vm.loadFestivals(it, schoolRegion) },
                 ) {
-                    dialog.show(
-                        parentFragmentManager,
-                        RegionBottomSheetDialogFragment::class.java.name,
-                    )
+                    createRegionDialog(schoolRegions).show(parentFragmentManager, tag)
                 },
             )
             addAll(festivals)
@@ -201,17 +197,16 @@ class FestivalListFragment : Fragment() {
 
     private fun FestivalListUiState.Success.createRegionDialog(
         schoolRegions: List<SchoolRegionUiState>,
-    ) = RegionBottomSheetDialogFragment.newInstance(
-        items = schoolRegions,
-        listener = object : RegionBottomSheetDialogFragment.OnRegionSelectListener {
-            override fun onRegionSelect(region: SchoolRegion) {
-                vm.loadFestivals(
-                    festivalFilterUiState = festivalFilter,
-                    schoolRegion = if (region == schoolRegion) null else region,
-                )
+    ): RegionBottomSheetDialogFragment {
+        return RegionBottomSheetDialogFragment().apply {
+            items = schoolRegions
+            listener = object : RegionBottomSheetDialogFragment.OnRegionSelectListener {
+                override fun onRegionSelect(region: SchoolRegion) {
+                    vm.loadFestivals(festivalFilter, region)
+                }
             }
-        },
-    )
+        }
+    }
 
     private fun showSearch() {
         findNavController().navigate(actionFestivalListFragmentToSearchFragment())

diff --git a/.../festago/presentation/ui/home/festivallist/bottomsheet/RegionBottomSheetDialogFragment.kt b/.../festago/presentation/ui/home/festivallist/bottomsheet/RegionBottomSheetDialogFragment.kt
@@ -8,35 +8,38 @@ import com.festago.festago.domain.model.festival.SchoolRegion
 import com.festago.festago.presentation.databinding.FragmentRegionBottomSheetBinding
 import com.festago.festago.presentation.ui.home.festivallist.uistate.SchoolRegionUiState
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import dagger.hilt.android.AndroidEntryPoint
 
-@AndroidEntryPoint
 class RegionBottomSheetDialogFragment() : BottomSheetDialogFragment() {
 
     private var _binding: FragmentRegionBottomSheetBinding? = null
     private val binding: FragmentRegionBottomSheetBinding get() = _binding!!
 
-    private lateinit var listener: OnRegionSelectListener
-    private lateinit var items: List<SchoolRegionUiState>
+    var items: List<SchoolRegionUiState>? = null
+    var listener: OnRegionSelectListener? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        super.onCreateView(inflater, container, savedInstanceState)
         _binding = FragmentRegionBottomSheetBinding.inflate(inflater)
         binding.lifecycleOwner = viewLifecycleOwner
         return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         initView()
     }
 
     private fun initView() {
+        val schoolRegions = items ?: return
+        val onRegionSelectListener = listener ?: return
+
         binding.rvRegionList.adapter = RegionAdapter(
-            items = items,
-            onRegionSelect = listener::onRegionSelect
+            items = schoolRegions,
+            onRegionSelect = onRegionSelectListener::onRegionSelect,
         ) { dismiss() }
     }
 
@@ -48,14 +51,4 @@ class RegionBottomSheetDialogFragment() : BottomSheetDialogFragment() {
     interface OnRegionSelectListener {
         fun onRegionSelect(region: SchoolRegion)
     }
-
-    companion object {
-        fun newInstance(
-            items: List<SchoolRegionUiState>,
-            listener: OnRegionSelectListener,
-        ): RegionBottomSheetDialogFragment = RegionBottomSheetDialogFragment().apply {
-            this.listener = listener
-            this.items = items
-        }
-    }
 }
diff --git a/backend/src/main/java/com/festago/admin/dto/artist/ArtistV1CreateRequest.java b/backend/src/main/java/com/festago/admin/dto/artist/ArtistV1CreateRequest.java
@@ -1,14 +1,15 @@
 package com.festago.admin.dto.artist;
 
 import com.festago.artist.dto.command.ArtistCreateCommand;
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotBlank;
 
 public record ArtistV1CreateRequest(
     @NotBlank
     String name,
-    @NotBlank
+    @Nullable
     String profileImageUrl,
-    @NotBlank
+    @Nullable
     String backgroundImageUrl
 ) {
 

diff --git a/backend/src/main/java/com/festago/admin/dto/artist/ArtistV1UpdateRequest.java b/backend/src/main/java/com/festago/admin/dto/artist/ArtistV1UpdateRequest.java
@@ -1,14 +1,15 @@
 package com.festago.admin.dto.artist;
 
 import com.festago.artist.dto.command.ArtistUpdateCommand;
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotBlank;
 
 public record ArtistV1UpdateRequest(
     @NotBlank
     String name,
-    @NotBlank
+    @Nullable
     String profileImageUrl,
-    @NotBlank
+    @Nullable
     String backgroundImageUrl
 ) {
 

diff --git a/backend/src/main/java/com/festago/admin/dto/socialmedia/SocialMediaCreateV1Request.java b/backend/src/main/java/com/festago/admin/dto/socialmedia/SocialMediaCreateV1Request.java
@@ -3,6 +3,7 @@
 import com.festago.socialmedia.domain.OwnerType;
 import com.festago.socialmedia.domain.SocialMediaType;
 import com.festago.socialmedia.dto.command.SocialMediaCreateCommand;
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
@@ -17,7 +18,7 @@ public record SocialMediaCreateV1Request(
     SocialMediaType socialMediaType,
     @NotBlank
     String name,
-    @NotBlank
+    @Nullable
     String logoUrl,
     @NotBlank
     String url

diff --git a/backend/src/main/java/com/festago/admin/dto/socialmedia/SocialMediaUpdateV1Request.java b/backend/src/main/java/com/festago/admin/dto/socialmedia/SocialMediaUpdateV1Request.java
@@ -1,14 +1,15 @@
 package com.festago.admin.dto.socialmedia;
 
 import com.festago.socialmedia.dto.command.SocialMediaUpdateCommand;
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Builder;
 
 @Builder
 public record SocialMediaUpdateV1Request(
     @NotBlank
     String name,
-    @NotBlank
+    @Nullable
     String logoUrl,
     @NotBlank
     String url

diff --git a/backend/src/main/java/com/festago/artist/application/ArtistDetailV1QueryService.java b/backend/src/main/java/com/festago/artist/application/ArtistDetailV1QueryService.java
@@ -1,7 +1,7 @@
 package com.festago.artist.application;
 
 import com.festago.artist.dto.ArtistDetailV1Response;
-import com.festago.artist.dto.ArtistFestivalDetailV1Response;
+import com.festago.artist.dto.ArtistFestivalV1Response;
 import com.festago.artist.repository.ArtistDetailV1QueryDslRepository;
 import com.festago.artist.repository.ArtistFestivalSearchCondition;
 import com.festago.common.exception.ErrorCode;
@@ -27,9 +27,9 @@ public ArtistDetailV1Response findArtistDetail(Long artistId) {
             .orElseThrow(() -> new NotFoundException(ErrorCode.ARTIST_NOT_FOUND));
     }
 
-    public Slice<ArtistFestivalDetailV1Response> findArtistFestivals(Long artistId, Long lastFestivalId,
-                                                                     LocalDate lastStartDate, boolean isPast,
-                                                                     Pageable pageable) {
+    public Slice<ArtistFestivalV1Response> findArtistFestivals(Long artistId, Long lastFestivalId,
+                                                               LocalDate lastStartDate, boolean isPast,
+                                                               Pageable pageable) {
         return artistDetailV1QueryDslRepository.findArtistFestivals(new ArtistFestivalSearchCondition(
                 artistId,
                 isPast,

diff --git a/backend/src/main/java/com/festago/artist/domain/Artist.java b/backend/src/main/java/com/festago/artist/domain/Artist.java
@@ -1,6 +1,8 @@
 package com.festago.artist.domain;
 
 import com.festago.common.domain.BaseTimeEntity;
+import com.festago.common.util.ImageUrlHelper;
+import com.festago.common.util.Validator;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -13,8 +15,6 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Artist extends BaseTimeEntity {
 
-    private static final String DEFAULT_URL = "https://picsum.photos/536/354";
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -27,24 +27,26 @@ public class Artist extends BaseTimeEntity {
     private String backgroundImageUrl;
 
     public Artist(Long id, String name, String profileImage, String backgroundImageUrl) {
+        validateName(name);
         this.id = id;
         this.name = name;
-        this.profileImage = profileImage;
-        this.backgroundImageUrl = backgroundImageUrl;
+        this.profileImage = ImageUrlHelper.getBlankStringIfBlank(profileImage);
+        this.backgroundImageUrl = ImageUrlHelper.getBlankStringIfBlank(backgroundImageUrl);
     }
 
-    public Artist(String name, String profileImage) {
-        this(null, name, profileImage, DEFAULT_URL);
+    private void validateName(String name) {
+        Validator.notBlank(name, "name");
     }
 
     public Artist(String name, String profileImage, String backgroundImageUrl) {
         this(null, name, profileImage, backgroundImageUrl);
     }
 
     public void update(String name, String profileImage, String backgroundImageUrl) {
+        validateName(name);
         this.name = name;
-        this.profileImage = profileImage;
-        this.backgroundImageUrl = backgroundImageUrl;
+        this.profileImage = ImageUrlHelper.getBlankStringIfBlank(profileImage);
+        this.backgroundImageUrl = ImageUrlHelper.getBlankStringIfBlank(backgroundImageUrl);
     }
 
     public Long getId() {

diff --git a/...t/dto/ArtistFestivalDetailV1Response.java → .../artist/dto/ArtistFestivalV1Response.java b/...t/dto/ArtistFestivalDetailV1Response.java → .../artist/dto/ArtistFestivalV1Response.java
@@ -7,7 +7,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.LocalDate;
 
-public record ArtistFestivalDetailV1Response(
+public record ArtistFestivalV1Response(
     Long id,
     String name,
     LocalDate startDate,
@@ -19,7 +19,7 @@ public record ArtistFestivalDetailV1Response(
 ) {
 
     @QueryProjection
-    public ArtistFestivalDetailV1Response {
+    public ArtistFestivalV1Response {
 
     }
 }
diff --git a/backend/src/main/java/com/festago/artist/dto/ArtistMediaV1Response.java b/backend/src/main/java/com/festago/artist/dto/ArtistMediaV1Response.java
@@ -1,9 +1,10 @@
 package com.festago.artist.dto;
 
+import com.festago.socialmedia.domain.SocialMediaType;
 import com.querydsl.core.annotations.QueryProjection;
 
 public record ArtistMediaV1Response(
-    String type,
+    SocialMediaType type,
     String name,
     String logoUrl,
     String url

diff --git a/backend/src/main/java/com/festago/artist/presentation/v1/ArtistSearchV1Controller.java b/backend/src/main/java/com/festago/artist/presentation/v1/ArtistSearchV1Controller.java
@@ -15,14 +15,14 @@
 
 @RestController
 @RequestMapping("/api/v1/search/artists")
-@Tag(name = "아티스트 검색 V1")
+@Tag(name = "아티스트 검색 요청 V1")
 @RequiredArgsConstructor
 public class ArtistSearchV1Controller {
 
     private final ArtistTotalSearchV1Service artistTotalSearchV1Service;
 
     @GetMapping
-    @Operation(description = "키워드로 아티스트 목록을 검색한다", summary = "아티스트 목록 검색 조회")
+    @Operation(description = "키워드로 아티스트 목록을 검색한다.", summary = "아티스트 검색")
     public ResponseEntity<List<ArtistTotalSearchV1Response>> searchByKeyword(@RequestParam String keyword) {
         Validator.notBlank(keyword, "keyword");
         List<ArtistTotalSearchV1Response> response = artistTotalSearchV1Service.findAllByKeyword(keyword);

diff --git a/...entation/v1/ArtistDetailV1Controller.java → ...t/presentation/v1/ArtistV1Controller.java b/...entation/v1/ArtistDetailV1Controller.java → ...t/presentation/v1/ArtistV1Controller.java
@@ -2,17 +2,17 @@
 
 import com.festago.artist.application.ArtistDetailV1QueryService;
 import com.festago.artist.dto.ArtistDetailV1Response;
-import com.festago.artist.dto.ArtistFestivalDetailV1Response;
+import com.festago.artist.dto.ArtistFestivalV1Response;
 import com.festago.common.aop.ValidPageable;
 import com.festago.common.dto.SliceResponse;
 import com.festago.common.exception.ValidException;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.time.LocalDate;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Slice;
-import org.springframework.data.web.PageableDefault;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -24,29 +24,29 @@
 @RequestMapping("/api/v1/artists")
 @Tag(name = "아티스트 정보 요청 V1")
 @RequiredArgsConstructor
-public class ArtistDetailV1Controller {
+public class ArtistV1Controller {
 
     private final ArtistDetailV1QueryService artistDetailV1QueryService;
 
     @GetMapping("/{artistId}")
-    @Operation(description = "아티스트의 정보를 조회한다.")
-    public ResponseEntity<ArtistDetailV1Response> getArtistInfo(@PathVariable Long artistId) {
+    @Operation(description = "아티스트의 정보를 조회한다.", summary = "아티스트 정보 조회")
+    public ResponseEntity<ArtistDetailV1Response> findArtistDetail(@PathVariable Long artistId) {
         return ResponseEntity.ok(artistDetailV1QueryService.findArtistDetail(artistId));
     }
 
     @GetMapping("/{artistId}/festivals")
-    @Operation(description = "아티스트가 참석한 축제를 조회한다. isPast 값으로 종료 축제 와 진행, 예정 축제를 구분 가능하다", summary = "아티스트 축제 조회")
+    @Operation(description = "아티스트가 참여한 축제 목록을 조회한다. isPast 값으로 종료 축제와 진행, 예정 축제를 구분 가능하다.", summary = "아티스트 참여 축제 목록 조회")
     @ValidPageable(maxSize = 20)
-    public ResponseEntity<SliceResponse<ArtistFestivalDetailV1Response>> getArtistInfo(
+    public ResponseEntity<SliceResponse<ArtistFestivalV1Response>> findArtistFestivals(
         @PathVariable Long artistId,
         @RequestParam(required = false) Long lastFestivalId,
         @RequestParam(required = false) LocalDate lastStartDate,
         @RequestParam(required = false, defaultValue = "false") boolean isPast,
-        @PageableDefault(size = 10) Pageable pageable
+        @Parameter(description = "0 < size <= 20") @RequestParam(defaultValue = "10") int size
     ) {
         validate(lastFestivalId, lastStartDate);
-        Slice<ArtistFestivalDetailV1Response> response = artistDetailV1QueryService.findArtistFestivals(artistId,
-            lastFestivalId, lastStartDate, isPast, pageable);
+        Slice<ArtistFestivalV1Response> response = artistDetailV1QueryService.findArtistFestivals(artistId,
+            lastFestivalId, lastStartDate, isPast, PageRequest.ofSize(size));
         return ResponseEntity.ok(SliceResponse.from(response));
     }