Skip to content

Commit 561414e

Browse files
authored
Merge pull request #33 from Final-Project-Team-Temporary/test#32-assignment-test
[TEST]#32 기사 할당 로직
2 parents 25c2d5c + 48d52f7 commit 561414e

65 files changed

Lines changed: 717 additions & 349 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ node_modules/
6666
# OS specific
6767
.DS_Store
6868

69+
actions-runner/
70+
6971
# Task files
70-
# tasks.json
71-
# tasks/
72+
tasks.json
73+
tasks/
74+
.taskmaster/*
75+
claude-code/*
76+
**/CLAUDE.md

src/main/java/com/example/whiplash/article/document/SummarizedArticle.java

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
import java.time.LocalDateTime;
1414

15-
@Document(collection = "summarized_articles")
16-
@Getter @Setter
15+
@Getter
1716
@NoArgsConstructor(access = AccessLevel.PROTECTED)
18-
@AllArgsConstructor
19-
@Builder
17+
@AllArgsConstructor(access = AccessLevel.PRIVATE)
18+
@Builder(access = AccessLevel.PRIVATE)
19+
@Document(collection = "summarized_articles")
2020
public class SummarizedArticle {
2121
@Id
2222
private String id;
@@ -36,4 +36,21 @@ public class SummarizedArticle {
3636

3737
private LocalDateTime publishedAt;
3838

39+
public static SummarizedArticle create(String originalArticleId,
40+
String title,
41+
Category category,
42+
String summarizedContent,
43+
SummaryLevel summaryLevel,
44+
LocalDateTime summarizedAt,
45+
LocalDateTime publishedAt) {
46+
return SummarizedArticle.builder()
47+
.originalArticleId(originalArticleId)
48+
.title(title)
49+
.category(category)
50+
.summarizedContent(summarizedContent)
51+
.summaryLevel(summaryLevel)
52+
.summarizedAt(summarizedAt)
53+
.publishedAt(publishedAt)
54+
.build();
55+
}
3956
}

src/main/java/com/example/whiplash/article/entity/ArticleKeyword.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.whiplash.article.entity;
22

3-
import com.example.whiplash.domain.entity.Keyword;
3+
import com.example.whiplash.user.domain.keyword.Keyword;
44
import jakarta.persistence.*;
55
import lombok.*;
66

src/main/java/com/example/whiplash/article/entity/UserArticleAssignment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.example.whiplash.article.entity;
22

33
import com.example.whiplash.domain.entity.history.email.EmailSendStatus;
4-
import com.example.whiplash.user.User;
4+
import com.example.whiplash.user.domain.User;
55
import lombok.*;
66
import jakarta.persistence.*;
77
import java.time.LocalDateTime;

src/main/java/com/example/whiplash/article/repository/SummarizedArticleRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88

99
public interface SummarizedArticleRepository extends MongoRepository<SummarizedArticle, String> {
1010

11-
List<SummarizedArticle> findAllByPublishedAtAfter(LocalDateTime publishedAtAfter);
11+
List<SummarizedArticle> findAllByPublishedAtGreaterThanEqual(LocalDateTime publishedAtIsGreaterThan);
1212
}

src/main/java/com/example/whiplash/article/repository/UserArticleAssignmentRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.example.whiplash.article.entity.UserArticleAssignment;
44
import com.example.whiplash.domain.entity.history.email.EmailSendStatus;
5-
import com.example.whiplash.user.User;
5+
import com.example.whiplash.user.domain.User;
66
import org.springframework.data.jpa.repository.JpaRepository;
77

88
import java.util.List;

src/main/java/com/example/whiplash/auth/controller/AuthController.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
import com.example.whiplash.apiPayload.ApiResponse;
44
import com.example.whiplash.auth.service.AuthService;
5-
import com.example.whiplash.user.dto.*;
5+
import com.example.whiplash.user.web.dto.request.LoginRequestDTO;
6+
import com.example.whiplash.user.web.dto.request.TokenRefreshRequestDTO;
7+
import com.example.whiplash.user.web.dto.response.TokenResponseDTO;
8+
import com.example.whiplash.user.web.dto.request.UserCreateDTO;
69
import jakarta.validation.Valid;
710
import lombok.RequiredArgsConstructor;
811
import org.springframework.http.ResponseEntity;

src/main/java/com/example/whiplash/auth/controller/KakaoTestController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.example.whiplash.apiPayload.ApiResponse;
44
import com.example.whiplash.auth.service.AuthService;
5-
import com.example.whiplash.user.dto.TokenResponseDTO;
5+
import com.example.whiplash.user.web.dto.response.TokenResponseDTO;
66
import lombok.RequiredArgsConstructor;
77
import org.springframework.http.ResponseEntity;
88
import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/example/whiplash/auth/controller/TestController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
@RequestMapping("/login")
1111
public class TestController {
1212

13-
@Value("${kakao.client_id}")
13+
@Value("${kakao.client-id}")
1414
private String client_id;
1515

16-
@Value("${kakao.redirect_uri}")
16+
@Value("${kakao.redirect-uri}")
1717
private String redirect_uri;
1818

1919
@GetMapping("/page")

src/main/java/com/example/whiplash/auth/service/AuthService.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55
import com.example.whiplash.config.security.jwt.JwtTokenProvider;
66
import com.example.whiplash.converter.AuthConverter;
77
import com.example.whiplash.converter.UserConverter;
8-
import com.example.whiplash.user.User;
9-
import com.example.whiplash.user.UserStatus;
10-
import com.example.whiplash.user.dto.*;
11-
import com.example.whiplash.user.repository.UserRepository;
8+
import com.example.whiplash.user.domain.User;
9+
import com.example.whiplash.user.domain.UserStatus;
10+
import com.example.whiplash.user.repository.user.UserRepository;
11+
import com.example.whiplash.user.web.dto.response.KakaoUserInfoResponseDTO;
12+
import com.example.whiplash.user.web.dto.request.LoginRequestDTO;
13+
import com.example.whiplash.user.web.dto.response.TokenResponseDTO;
14+
import com.example.whiplash.user.web.dto.request.UserCreateDTO;
1215
import lombok.RequiredArgsConstructor;
1316
import lombok.extern.slf4j.Slf4j;
1417
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

0 commit comments

Comments
 (0)