Skip to content

Commit

Permalink
Merge branch 'feat/#71' of https://github.com/TeamACON/ACON-SERVER in…
Browse files Browse the repository at this point in the history
…to feat/#73
  • Loading branch information
gahyuun committed Feb 14, 2025
2 parents 372426b + 1d3e024 commit cdc2136
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,21 @@

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import jakarta.validation.constraints.NotNull;
import java.util.List;
import lombok.Builder;
import lombok.NonNull;

@Builder
@JsonInclude(Include.NON_NULL)
public record ProfileResponse(
@NotNull
String image,
@NotNull
String nickname,
int leftAcornCount,
String birthDate,
@NotNull
List<VerifiedArea> verifiedArea
) {

public record VerifiedArea(
@NonNull
Long id,
@NonNull
String name
) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -106,6 +105,7 @@ protected Long fetchMemberId(
.socialType(socialType)
.socialId(socialId)
.leftAcornCount(25)
// TODO: 닉네임 생성 방식 변경
.nickname(UUID.randomUUID().toString())
// TODO: 기본 이미지 구현 전까지 임의로 이미지 할당
.profileImage("https://avatars.githubusercontent.com/u/81469686?v=4")
Expand Down Expand Up @@ -227,7 +227,7 @@ public ProfileResponse fetchProfile() {
.verifiedArea(verifiedAreaEntityList.stream()
.map(verifiedAreaEntity -> new ProfileResponse.VerifiedArea(verifiedAreaEntity.getId(),
verifiedAreaEntity.getName()))
.collect(Collectors.toList()))
.toList())
.build();
}

Expand Down

0 comments on commit cdc2136

Please sign in to comment.