Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import com.example.konnect_backend.domain.user.dto.ChildDto;
import com.example.konnect_backend.domain.user.dto.ChildUpdateDto;
import com.example.konnect_backend.domain.user.dto.UserInfoDto;
import com.example.konnect_backend.domain.user.service.UserService;
import com.example.konnect_backend.global.ApiResponse;
import io.swagger.v3.oas.annotations.Operation;
Expand Down Expand Up @@ -45,4 +46,11 @@ public ApiResponse<Void> deleteChild(@PathVariable Long childId) {
userService.deleteChild(childId);
return ApiResponse.onSuccess(null);
}

@GetMapping("")
@Operation(summary = "유저 조회", description = "현재 로그인한 사용자의 정보를 조회합니다.")
public ApiResponse<UserInfoDto> getUserInfo() {
return ApiResponse.onSuccess(userService.getUserInfo());
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.example.konnect_backend.domain.user.dto;

import com.example.konnect_backend.domain.user.entity.status.Language;
import lombok.*;

@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class UserInfoDto {
private String name;
private Language language;
private String email;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import com.example.konnect_backend.domain.user.dto.ChildDto;
import com.example.konnect_backend.domain.user.dto.ChildUpdateDto;
import com.example.konnect_backend.domain.user.dto.UserInfoDto;
import com.example.konnect_backend.domain.user.entity.Child;
import com.example.konnect_backend.domain.user.entity.User;
import com.example.konnect_backend.domain.user.repository.ChildRepository;
Expand Down Expand Up @@ -111,4 +112,19 @@ public void deleteChild(Long childId) {

childRepository.delete(child);
}

@Transactional
public UserInfoDto getUserInfo(){
Long userId = SecurityUtil.getCurrentUserIdOrNull();
if (userId == null) {
throw new GeneralException(ErrorStatus.UNAUTHORIZED);
}

User user = userRepository.findById(userId).orElseThrow(() -> new GeneralException(ErrorStatus.USER_NOT_FOUND));
return UserInfoDto.builder()
.email(user.getEmail())
.name(user.getName())
.language(user.getLanguage())
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ public CorsConfigurationSource corsConfigurationSource() {
"https://www.konnect-women.site",
"http://konnect-women.site",
"http://www.konnect-women.site",
"http://localhost:8081"
"https://www.api.konnect-women.site",
"http://www.api.konnect-women.site"
);

config.setAllowedOrigins(allowedOrigins);
Expand Down