Merge remote-tracking branch 'origin/dev-server' into dev-server

# Conflicts:
#	backend/src/main/java/com/backend/global/config/auth/handler/CustomOAuth2UserService.java

backend/src/main/java/com/backend/global/config/auth/dto/OAuthAttributes.java

@@ -1,14 +1,19 @@
 package com.backend.global.config.auth.dto;
 
+import com.backend.domain.point.application.PointService;
+import com.backend.domain.point.domain.PointType;
 import com.backend.domain.user.domain.User;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
 import java.util.Map;
 
 /**
  * OAuth2 로그인 시 반환되는 사용자 정보
  */
+@Slf4j
 @Getter
 public class OAuthAttributes {
     private final Map<String, Object> attributes;
@@ -90,7 +95,7 @@ private static OAuthAttributes ofKakao(String registrationId, String userNameAtt
                 .build();
     }
 
-    public User toEntity() {
+    public User toEntity(PointService pointService, PasswordEncoder passwordEncoder) {
         User user = User.builder()
                 .userRole("ROLE_USER")
                 .profileImage(profileImage)
@@ -100,6 +105,11 @@ public User toEntity() {
 //                .about("안녕하세요. " + name + "입니다.")
                 .build();
 
+        user.setPassword(passwordEncoder.encode(user.getNickname()));
+
+        pointService.addCash(user, 1000000, PointType.SignUpPoint);
+        log.info("회원가입 포인트 지급");
+
         return user;
 
     }