Skip to content

[Fix] Fix Merge Conflict #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chaeyuuu merged 2 commits into from
Jul 29, 2025
Merged

[Fix] Fix Merge Conflict #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0839a57
fix: fix conflict error
chaeyuuu Jul 29, 2025
1ae85e9
Merge remote-tracking branch 'origin/feat/#29/url-fraud-api' into fea…
chaeyuuu Jul 29, 2025
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
16 changes: 6 additions & 10 deletions src/main/java/com/blockguard/server/domain/analysis/domain/enums/RiskLevel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,22 @@

import lombok.Getter;
import com.fasterxml.jackson.annotation.JsonValue;

import lombok.AllArgsConstructor;

@AllArgsConstructor

@Getter
public enum RiskLevel {
Dangers("위험"),
Caution("주의"),
Safety("안전");

private final String name;
private final String value;

@JsonValue
public String getValue(){
return value;
return value;
}

RiskLevel(String name) {
this.name = name;
RiskLevel(String value) {
this.value = value;
}

public static RiskLevel fromScore(double score) {
Expand All @@ -33,4 +29,4 @@ public static RiskLevel fromScore(double score) {
return Dangers;
}
}
}
}