-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/woowacourse-teams/2024-r…
…eview-me into fe/ci/85-build-ci
- Loading branch information
Showing
122 changed files
with
2,379 additions
and
904 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,6 +9,8 @@ on: | |
pull_request: | ||
branches: | ||
- develop | ||
paths: | ||
- 'backend/**' | ||
|
||
jobs: | ||
build: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package reviewme.config; | ||
|
||
import org.springframework.context.annotation.Configuration; | ||
import org.springframework.web.servlet.config.annotation.CorsRegistry; | ||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; | ||
|
||
@Configuration | ||
public class CorsConfig implements WebMvcConfigurer { | ||
|
||
@Override | ||
public void addCorsMappings(CorsRegistry registry) { | ||
registry.addMapping("/**") | ||
.allowedMethods("*") | ||
.allowedOrigins("*"); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 0 additions & 16 deletions
16
backend/src/main/java/reviewme/keyword/contoller/KeywordApi.java
This file was deleted.
Oops, something went wrong.
21 changes: 0 additions & 21 deletions
21
backend/src/main/java/reviewme/keyword/contoller/KeywordController.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
backend/src/main/java/reviewme/keyword/domain/Keywords.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
package reviewme.keyword.domain; | ||
|
||
import jakarta.persistence.CollectionTable; | ||
import jakarta.persistence.ElementCollection; | ||
import jakarta.persistence.Embeddable; | ||
import jakarta.persistence.JoinColumn; | ||
import java.util.Collections; | ||
import java.util.List; | ||
import java.util.Set; | ||
import java.util.stream.Collectors; | ||
import lombok.AccessLevel; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
import reviewme.keyword.domain.exception.DuplicateKeywordException; | ||
import reviewme.keyword.domain.exception.KeywordLimitExceedException; | ||
|
||
@Embeddable | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
@Getter | ||
public class Keywords { | ||
|
||
private static final int MAX_KEYWORD_COUNT = 5; | ||
|
||
@ElementCollection | ||
@CollectionTable(name = "review_keyword", joinColumns = @JoinColumn(name = "review_id")) | ||
private Set<Long> keywordIds; | ||
|
||
public Keywords(List<Keyword> selectedKeywords) { | ||
if (selectedKeywords.size() > MAX_KEYWORD_COUNT) { | ||
throw new KeywordLimitExceedException(MAX_KEYWORD_COUNT); | ||
} | ||
if (hasDuplicateKeywords(selectedKeywords)) { | ||
throw new DuplicateKeywordException(); | ||
} | ||
this.keywordIds = selectedKeywords.stream() | ||
.map(Keyword::getId) | ||
.collect(Collectors.toSet()); | ||
} | ||
|
||
private boolean hasDuplicateKeywords(List<Keyword> selectedKeywords) { | ||
long distinctKeywordCount = selectedKeywords.stream() | ||
.distinct() | ||
.count(); | ||
return selectedKeywords.size() != distinctKeywordCount; | ||
} | ||
|
||
public Set<Long> getKeywordIds() { | ||
return Collections.unmodifiableSet(keywordIds); | ||
} | ||
} |
34 changes: 0 additions & 34 deletions
34
backend/src/main/java/reviewme/keyword/domain/SelectedKeywords.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
backend/src/main/java/reviewme/member/domain/GithubId.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
package reviewme.member.domain; | ||
|
||
import jakarta.persistence.Column; | ||
import jakarta.persistence.Embeddable; | ||
import lombok.AccessLevel; | ||
import lombok.EqualsAndHashCode; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Embeddable | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
@EqualsAndHashCode(of = "id") | ||
@Getter | ||
public class GithubId { | ||
|
||
@Column(name = "github_id", nullable = false) | ||
private long id; | ||
|
||
public GithubId(long id) { | ||
this.id = id; | ||
} | ||
} |
16 changes: 7 additions & 9 deletions
16
...me/member/domain/GithubReviewerGroup.java → .../member/domain/GithubIdReviewerGroup.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.