refactor(user): user 리팩토링

src/main/java/com/project/bumawiki/domain/auth/presentation/AuthController.java

@@ -9,7 +9,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.project.bumawiki.domain.auth.presentation.dto.LoginReqestDto;
+import com.project.bumawiki.domain.auth.presentation.dto.LoginRequestDto;
 import com.project.bumawiki.domain.auth.presentation.dto.RefreshTokenRequestDto;
 import com.project.bumawiki.domain.auth.presentation.dto.TokenResponseDto;
 import com.project.bumawiki.domain.auth.service.CommandAuthService;
@@ -24,8 +24,8 @@ public class AuthController {
 	private final CommandAuthService commandAuthService;
 
 	@PostMapping("/oauth/bsm")
-	public TokenResponseDto userSignup(@RequestBody LoginReqestDto loginReqestDto) throws IOException {
-		return TokenResponseDto.from(commandAuthService.login(loginReqestDto.accessToken()));
+	public TokenResponseDto userSignup(@RequestBody LoginRequestDto loginRequestDto) throws IOException {
+		return TokenResponseDto.from(commandAuthService.login(loginRequestDto.authId()));
 	}
 
 	@PutMapping("/refresh/access")

src/main/java/com/project/bumawiki/domain/auth/presentation/dto/LoginReqestDto.java → src/main/java/com/project/bumawiki/domain/auth/presentation/dto/LoginRequestDto.java

@@ -1,6 +1,6 @@
 package com.project.bumawiki.domain.auth.presentation.dto;
 
-public record LoginReqestDto(
-	String accessToken
+public record LoginRequestDto(
+	String authId
 ) {
 }

src/main/java/com/project/bumawiki/domain/user/domain/User.java

@@ -1,22 +1,14 @@
 package com.project.bumawiki.domain.user.domain;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import com.project.bumawiki.domain.thumbsup.domain.ThumbsUp;
-import com.project.bumawiki.domain.thumbsup.presentation.dto.ThumbsUpResponseDto;
 import com.project.bumawiki.domain.user.domain.authority.Authority;
 
-import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
@@ -37,13 +29,6 @@ public class User {
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 
-	@OneToMany(
-		mappedBy = "user",
-		fetch = FetchType.LAZY,
-		cascade = CascadeType.ALL,
-		orphanRemoval = true)
-	@Builder.Default
-	private final List<ThumbsUp> thumbsUps = new ArrayList<>();
 	@Email
 	@Size(max = 32)
 	@Column(unique = true, length = 32)
@@ -59,26 +44,21 @@ public class User {
 	@Column(length = 16)
 	@Enumerated(EnumType.STRING)
 	private Authority authority;
+
 	@NotNull
 	@Size(max = 16)
 	@Column(length = 16)
 	private String name;
 
-	public List<ThumbsUpResponseDto> getList() {
-		return this.thumbsUps
-			.stream()
-			.map(ThumbsUp::getDto)
-			.toList();
-	}
-
 	public void update(User user) {
 		this.email = user.getEmail();
 		this.name = user.getName();
 		this.enroll = user.getEnroll();
 		this.nickName = user.getNickName();
 	}
 
-	public void changeUserAuthority(Authority authority) {
+	public void updateAuthority(Authority authority) {
 		this.authority = authority;
 	}
+
 }

src/main/java/com/project/bumawiki/domain/user/implementation/UserUpdater.java

@@ -1,11 +1,16 @@
 package com.project.bumawiki.domain.user.implementation;
 
 import com.project.bumawiki.domain.user.domain.User;
+import com.project.bumawiki.domain.user.domain.authority.Authority;
 import com.project.bumawiki.global.annotation.Implementation;
 
 @Implementation
 public class UserUpdater {
 	public void update(User user, User newUserInfo) {
 		user.update(newUserInfo);
 	}
+
+	public void updateAuthority(User user, Authority authority) {
+		user.updateAuthority(authority);
+	}
 }

src/main/java/com/project/bumawiki/domain/user/presentation/UserController.java

@@ -0,0 +1,59 @@
+package com.project.bumawiki.domain.user.presentation;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.project.bumawiki.domain.auth.annotation.AdminOnly;
+import com.project.bumawiki.domain.auth.annotation.LoginRequired;
+import com.project.bumawiki.domain.auth.service.QueryAuthService;
+import com.project.bumawiki.domain.docs.service.QueryDocsService;
+import com.project.bumawiki.domain.user.domain.User;
+import com.project.bumawiki.domain.user.presentation.dto.UserAuthorityRequestDto;
+import com.project.bumawiki.domain.user.presentation.dto.UserResponseDto;
+import com.project.bumawiki.domain.user.service.CommandUserService;
+import com.project.bumawiki.domain.user.service.QueryUserService;
+
+import lombok.RequiredArgsConstructor;
+
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/user")
+public class UserController {
+
+	private final QueryUserService userInfoService;
+	private final QueryDocsService queryDocsService;
+	private final QueryAuthService queryAuthService;
+	private final CommandUserService commandUserService;
+
+	@GetMapping
+	@LoginRequired
+	public UserResponseDto findMyInfo() {
+		User user = queryAuthService.getCurrentUser();
+		return new UserResponseDto(user, queryDocsService.findAllVersionDocsByUser(user));
+	}
+
+	@GetMapping("/{id}")
+	public UserResponseDto findAnotherUserInFo(@PathVariable Long id) {
+		User foundUser = userInfoService.findUserInfo(id);
+		return new UserResponseDto(
+			foundUser,
+			queryDocsService.findAllVersionDocsByUser(foundUser)
+		);
+	}
+
+	@AdminOnly
+	@PatchMapping("/authority")
+	@ResponseStatus(HttpStatus.NO_CONTENT)
+	public void updateUserAuthority(@RequestBody UserAuthorityRequestDto userAuthorityRequestDto) {
+		commandUserService.updateUserAuthority(userAuthorityRequestDto.id(), userAuthorityRequestDto.authority());
+	}
+
+}

src/main/java/com/project/bumawiki/domain/user/presentation/dto/SimpleUserDto.java

@@ -2,22 +2,19 @@
 
 import com.project.bumawiki.domain.user.domain.User;
 
-import lombok.Getter;
-
-@Getter
-public class SimpleUserDto {
-	private final Long id;
-
-	private final String email;
-
-	private final String nickName;
-
-	private final String name;
+public record SimpleUserDto(
+	Long id,
+	String email,
+	String nickName,
+	String name
+) {
 
 	public SimpleUserDto(User user) {
-		this.id = user.getId();
-		this.email = user.getEmail();
-		this.nickName = user.getNickName();
-		this.name = user.getName();
+		this(
+			user.getId(),
+			user.getEmail(),
+			user.getNickName(),
+			user.getName()
+		);
 	}
 }

src/main/java/com/project/bumawiki/domain/user/presentation/dto/UserAuthorityRequestDto.java

@@ -0,0 +1,11 @@
+package com.project.bumawiki.domain.user.presentation.dto;
+
+import com.project.bumawiki.domain.user.domain.authority.Authority;
+
+import jakarta.validation.constraints.NotNull;
+
+public record UserAuthorityRequestDto(
+	@NotNull Long id,
+	@NotNull Authority authority
+) {
+}