Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
.authorizeHttpRequests((auth) ->
auth
.requestMatchers(
"/login/oauth2/code/*", "/api/auth/signup", "/api/auth/login", "/api/auth"
"/login/**", "/api/auth/signup", "/api/auth/login", "/api/auth"
).permitAll()
.requestMatchers("/api/admin/**").hasRole("ADMIN")
.anyRequest().authenticated()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import site.sonisori.sonisori.common.response.SuccessResponse;
import site.sonisori.sonisori.dto.signword.SignWordDetailResponse;
import site.sonisori.sonisori.dto.signword.SignWordRequest;
import site.sonisori.sonisori.dto.signword.SignWordResponse;
import site.sonisori.sonisori.service.SignWordService;
Expand All @@ -31,6 +32,14 @@ public ResponseEntity<List<SignWordResponse>> getAllSignWords() {
return ResponseEntity.ok(signWords);
}

@GetMapping("/words/{wordId}")
public ResponseEntity<SignWordDetailResponse> getSignWordDetails(
@PathVariable(name = "wordId") Long wordId
) {
SignWordDetailResponse signWordDetail = signWordService.getSignWordDetail(wordId);
return ResponseEntity.ok(signWordDetail);
}

@PostMapping("/admin/words")
public ResponseEntity<SuccessResponse> addSignWordByAdmin(@RequestBody @Valid SignWordRequest signWordRequest) {
SuccessResponse successResponse = signWordService.addSignWord(signWordRequest);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package site.sonisori.sonisori.dto.signword;

import java.util.List;

import site.sonisori.sonisori.dto.signwordresource.SignWordResourceDto;

public record SignWordDetailResponse(
String word,
String description,
List<SignWordResourceDto> resources
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import jakarta.validation.constraints.Size;
import site.sonisori.sonisori.common.enums.ResourceType;

public record SignWordResourceRequest(
public record SignWordResourceDto(
@NotNull
ResourceType resourceType,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
public record SignWordResourceListRequest(
@NotNull
@Size(min = 1)
List<SignWordResourceRequest> resources
List<SignWordResourceDto> resources
) {
}
7 changes: 7 additions & 0 deletions src/main/java/site/sonisori/sonisori/entity/SignWord.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
package site.sonisori.sonisori.entity;

import java.util.List;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
Expand Down Expand Up @@ -36,6 +40,9 @@ public class SignWord extends DateEntity {
@Size(max = 500)
private String description;

@OneToMany(mappedBy = "signWord", fetch = FetchType.LAZY)
private List<SignWordResource> signWordResources;

public SignWordResponse toDto() {
return new SignWordResponse(this.id, this.word);
}
Expand Down
23 changes: 23 additions & 0 deletions src/main/java/site/sonisori/sonisori/service/SignWordService.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@
import lombok.RequiredArgsConstructor;
import site.sonisori.sonisori.common.constants.ErrorMessage;
import site.sonisori.sonisori.common.response.SuccessResponse;
import site.sonisori.sonisori.dto.signword.SignWordDetailResponse;
import site.sonisori.sonisori.dto.signword.SignWordRequest;
import site.sonisori.sonisori.dto.signword.SignWordResponse;
import site.sonisori.sonisori.dto.signwordresource.SignWordResourceDto;
import site.sonisori.sonisori.entity.SignWord;
import site.sonisori.sonisori.entity.SignWordResource;
import site.sonisori.sonisori.exception.NotFoundException;
import site.sonisori.sonisori.repository.SignWordRepository;

Expand All @@ -27,6 +30,26 @@ public List<SignWordResponse> getAllSignWords() {
.collect(Collectors.toList());
}

@Transactional(readOnly = true)
public SignWordDetailResponse getSignWordDetail(Long wordId) {
SignWord signWord = signWordRepository.findById(wordId)
.orElseThrow(() -> new NotFoundException(ErrorMessage.NOT_FOUND_WORD.getMessage()));

List<SignWordResourceDto> resources = mapSignWordResources(signWord.getSignWordResources());

return new SignWordDetailResponse(
signWord.getWord(),
signWord.getDescription(),
resources
);
}

private List<SignWordResourceDto> mapSignWordResources(List<SignWordResource> resources) {
return resources.stream()
.map(resource -> new SignWordResourceDto(resource.getResourceType(), resource.getResourceUrl()))
.toList();
}

@Transactional
public SuccessResponse addSignWord(SignWordRequest signWordRequest) {
SignWord signWord = SignWord.builder()
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/db/migration/V5__add_cascade_settings.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ALTER TABLE `sonisori`.`sign_word_resources`
DROP FOREIGN KEY `fk_sign-word-resources_sign-word_id`;
ALTER TABLE `sonisori`.`sign_word_resources`
ADD CONSTRAINT `fk_sign-word-resources_sign-word_id`
FOREIGN KEY (`sign_word_id`)
REFERENCES `sonisori`.`sign_words` (`id`)
ON DELETE CASCADE;
Loading