Skip to content
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

Jump to bottom

[Merge] test branch merge #148

Merged
merged 2 commits into from
Jan 17, 2024
Merged

[Merge] test branch merge #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c8ee0f
[#138] refactor: Link Dto 네이밍 변경
mmihye Jan 17, 2024
51dd0f9
Merge pull request #147 from Link-MIND/feature/#138
mmihye Jan 17, 2024
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
10 changes: 2 additions & 8 deletions linkmind/src/main/java/com/app/toaster/controller/ToastController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,19 @@
import java.io.IOException;
import java.util.List;

import com.app.toaster.controller.response.toast.WeekSiteDto;
import com.app.toaster.infrastructure.LinkRepository;
import com.app.toaster.controller.response.toast.WeekLinkDto;
import com.app.toaster.service.link.LinkService;
import org.checkerframework.checker.units.qual.A;
import org.springframework.http.HttpStatus;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

import com.app.toaster.common.dto.ApiResponse;
// import com.app.toaster.config.UserId;
Expand All @@ -33,7 +28,6 @@
import com.app.toaster.service.parse.ParsingService;
import com.app.toaster.service.toast.ToastService;

import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;

@RestController
Expand Down Expand Up @@ -86,7 +80,7 @@ public ApiResponse deleteToast( //나중에 softDelete로 변경

@GetMapping("/week")
@ResponseStatus(HttpStatus.OK)
public ApiResponse<List<WeekSiteDto>> getWeekLinks(
public ApiResponse<List<WeekLinkDto>> getWeekLinks(
@UserId Long userId
) {
return ApiResponse.success(Success.GET_LINKS_SUCCESS, linkService.getWeekLinks());
Expand Down
9 changes: 9 additions & 0 deletions linkmind/src/main/java/com/app/toaster/controller/response/toast/WeekLinkDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.app.toaster.controller.response.toast;

import com.app.toaster.domain.Link;

public record WeekLinkDto(Long linkId, String linkTitle, String linkImg, String linkUrl) {
public static WeekLinkDto of(Link link){
return new WeekLinkDto(link.getId(), link.getTitle(), link.getThumbnailUrl(), link.getLinkUrl());
}
}
9 changes: 0 additions & 9 deletions linkmind/src/main/java/com/app/toaster/controller/response/toast/WeekSiteDto.java
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions linkmind/src/main/java/com/app/toaster/service/link/LinkService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
package com.app.toaster.service.link;

import com.app.toaster.controller.response.toast.WeekSiteDto;
import com.app.toaster.controller.response.toast.WeekLinkDto;
import com.app.toaster.infrastructure.LinkRepository;
import jakarta.persistence.criteria.CriteriaBuilder;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;

@Service
@RequiredArgsConstructor
public class LinkService {

private final LinkRepository linkRepository;
public List<WeekSiteDto> getWeekLinks(){
public List<WeekLinkDto> getWeekLinks(){

return linkRepository.findRandom3Links().stream().map(WeekSiteDto::of).toList();
return linkRepository.findRandom3Links().stream().map(WeekLinkDto::of).toList();
}


Expand Down
9 changes: 0 additions & 9 deletions linkmind/src/main/java/com/app/toaster/service/toast/ToastService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
package com.app.toaster.service.toast;

import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.Arrays;
import java.util.List;
import java.util.StringTokenizer;
import java.util.stream.Collectors;

import org.slf4j.LoggerFactory;
import com.app.toaster.controller.response.toast.WeekSiteDto;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand All @@ -25,20 +20,16 @@
import com.app.toaster.exception.model.CustomException;
import com.app.toaster.exception.model.ForbiddenException;
import com.app.toaster.exception.model.NotFoundException;
import com.app.toaster.exception.model.UnauthorizedException;
import com.app.toaster.external.client.aws.ImagePresignedUrlResponse;
import com.app.toaster.external.client.aws.PresignedUrlVO;
import com.app.toaster.external.client.aws.S3Service;
import com.app.toaster.infrastructure.CategoryRepository;
import com.app.toaster.infrastructure.ToastRepository;
import com.app.toaster.infrastructure.UserRepository;
import com.app.toaster.service.parse.ParsingService;
import com.google.api.client.util.IOUtils;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import okhttp3.Response;
import software.amazon.awssdk.utils.IoUtils;
import software.amazon.awssdk.utils.Logger;

@Service
Expand Down