Merge pull request #34 from Team-UniVoice/feat/#33-fix-with-validation

Feat/#33 fix with validation

src/main/java/sopt/univoice/domain/affiliation/entity/Affiliation.java

@@ -31,6 +31,7 @@ public class Affiliation extends BaseTimeEntity {
 
     private String affiliationLogoImage;
 
+    private String  affiliationUniversityName;
 
     @OneToMany(mappedBy = "affiliation", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Member> members;

src/main/java/sopt/univoice/domain/affiliation/repository/AffiliationRepository.java

@@ -4,5 +4,6 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import sopt.univoice.domain.affiliation.entity.Affiliation;
 
-public interface AffiliationRepository extends JpaRepository<Affiliation, Integer> {
+public interface AffiliationRepository extends JpaRepository<Affiliation, Long> {
+    Affiliation findByAffiliationAndAffiliationUniversityName(String affiliation, String affiliationUniversityName);
 }

src/main/java/sopt/univoice/domain/auth/controller/AuthController.java

@@ -38,15 +38,12 @@ public ResponseEntity<SuccessStatusResponse<Void>> checkEmail(@RequestBody Check
 
 
     @PostMapping("/signin")
-    public ResponseEntity<UserLoginResponse> signIn(@RequestBody MemberSignInRequest memberSignInRequest) {
+    public ResponseEntity<SuccessStatusResponse<UserLoginResponse>>signIn(@RequestBody MemberSignInRequest memberSignInRequest) {
 
         UserLoginResponse userLoginResponse = authService.logineMember(memberSignInRequest);
 
-        return ResponseEntity.status(HttpStatus.CREATED)
-                .header("Location", userLoginResponse.userId())
-                .body(
-                        userLoginResponse
-                );
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(SuccessStatusResponse.of(SuccessMessage.SIGNIN_SUCCESS, userLoginResponse));
     }
 
     @PostMapping("/signup")

src/main/java/sopt/univoice/domain/auth/dto/UserLoginResponse.java

@@ -1,14 +1,12 @@
 package sopt.univoice.domain.auth.dto;
 
 public record UserLoginResponse(
-        String accessToken,
-        String userId
+        String accessToken
 ) {
 
     public static UserLoginResponse of(
-            String accessToken,
-            String userId
+            String accessToken
     ) {
-        return new UserLoginResponse(accessToken, userId);
+        return new UserLoginResponse(accessToken);
     }
 }

src/main/java/sopt/univoice/domain/auth/service/AuthService.java

@@ -210,7 +210,7 @@ public UserLoginResponse logineMember(
                 .orElseThrow(() -> new UnauthorizedException(ErrorMessage.JWT_UNAUTHORIZED_EXCEPTION));
 
         if (!passwordEncoder.matches(memberSignInRequest.getPassword(), member.getPassword())) {
-            throw new UnauthorizedException(ErrorMessage.JWT_UNAUTHORIZED_EXCEPTION);
+            throw new UnauthorizedException(ErrorMessage.JWT_LOGIN_EXCEPTION);
         }
 
         Long memberId = member.getId();
@@ -219,13 +219,7 @@ public UserLoginResponse logineMember(
                 UserAuthentication.createUserAuthentication(memberId, authorities)
         );
 
-        return UserLoginResponse.of(accessToken, memberId.toString());
+        return UserLoginResponse.of(accessToken);
     }
 
-
-
-
-
-
-
 }

src/main/java/sopt/univoice/domain/notice/controller/NoticeController.java

@@ -79,7 +79,7 @@ public ResponseEntity<SuccessStatusResponse<Object>> viewCount(@PathVariable Lon
     public ResponseEntity<SuccessStatusResponse<Object>> quickhead() {
         QuickScanDTO response = noticeService.quickhead();
         return ResponseEntity.status(HttpStatus.OK)
-                .body(SuccessStatusResponse.of(SuccessMessage.GET_ALL_NOTICE_SUCCESS, response));
+                .body(SuccessStatusResponse.of(SuccessMessage.GET_QUCIK_HEAD_SUCCESS, response));
     }
 
     @GetMapping("/all")

src/main/java/sopt/univoice/domain/notice/dto/NoticeCreateRequest.java

@@ -27,6 +27,6 @@ public class NoticeCreateRequest {
     @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
     private LocalDateTime endTime;
 
-    private List<MultipartFile> studentCardImages;
+    private List<MultipartFile> noticeImages;
 
 }

src/main/java/sopt/univoice/domain/notice/dto/NoticeDTO.java

@@ -17,4 +17,11 @@ public class NoticeDTO {
     private Long likeCount;
     private Long saveCount;
     private String category;
+    private LocalDateTime createdAt; // 추가된 부분
+    private LocalDateTime updatedAt; // 추가된 부분
+
+    public LocalDateTime getCreatedAt() {
+        return createdAt;
+    }
+
 }

src/main/java/sopt/univoice/domain/notice/dto/NoticeDetailResponseDTO.java

@@ -22,4 +22,6 @@ public class NoticeDetailResponseDTO {
     private Long memberId;
     private String writeAffiliation;
     private List<String> noticeImages;
+    private LocalDateTime createdAt; // 추가된 부분
+    private LocalDateTime updatedAt; // 추가된 부분
 }

src/main/java/sopt/univoice/domain/notice/dto/NoticeResponseDTO.java

@@ -18,4 +18,6 @@ public class NoticeResponseDTO {
     private Long likeCount;
     private Long saveCount;
     private String category;
+    private LocalDateTime createdAt; // 추가된 부분
+    private LocalDateTime updatedAt; // 추가된 부분
 }

src/main/java/sopt/univoice/domain/notice/dto/NoticeSaveDTO.java

@@ -15,4 +15,6 @@ public class NoticeSaveDTO {
     private String category;
     private LocalDateTime startTime;
     private LocalDateTime endTime;
+    private LocalDateTime createdAt; // 추가된 부분
+    private LocalDateTime updatedAt; // 추가된 부분
 }

src/main/java/sopt/univoice/domain/notice/dto/QuickQueryNoticeDTO.java

@@ -15,5 +15,7 @@ public class QuickQueryNoticeDTO {
     private Long likeCount;
     private Long saveCount;
     private String category;
+    private LocalDateTime createdAt; // 추가된 부분
+    private LocalDateTime updatedAt; // 추가된 부분
 }
 

src/main/java/sopt/univoice/domain/notice/dto/QuickScanDTO.java

@@ -10,9 +10,15 @@
 public class QuickScanDTO {
     private String universityName;
     private int universityNameCount;
+    private String universityLogoImage;
+
+
     private String collegeDepartmentName;
     private int collegeDepartmentCount;
+    private String collegeDepartmentLogoImage;
+
     private String departmentName;
     private int departmentCount;
+    private String departmentLogoImage;
 }
 

src/main/java/sopt/univoice/domain/notice/entity/SaveNotice.java

@@ -5,12 +5,13 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import sopt.univoice.domain.user.entity.Member;
+import sopt.univoice.infra.persistence.BaseTimeEntity;
 
 
 @Entity
 @Getter
 @NoArgsConstructor
-public class SaveNotice {
+public class SaveNotice extends BaseTimeEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;