Skip to content

Commit

Permalink
Merge pull request #44 from Team-Greendar/feature/eventTodo
Browse files Browse the repository at this point in the history
fix :fix file api mapping
  • Loading branch information
chosunghyun18 authored Feb 14, 2023
2 parents e728109 + 0772ec4 commit 08784f3
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ public ApiResponse getEventTodoRatioByDate(@RequestHeader("Authorization") Strin
Member member = memberService.findOneByToken(firebaseToken);

TreeMap<LocalDate, Float> result =eventTodoService.getRatioByDailyInMonth(date,member);
System.out.println("!?--!?");
System.out.println(result);
System.out.println("!?--!?");
List<DailyAchievementRatio> dailyAchievementRatios = result.entrySet()
.stream()
.map(DailyAchievementRatio::new)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import greendar.domain.privatetodo.dto.PrivateTodoDtos.PrivateTodoTaskPutRequestDto;
import greendar.global.common.ApiResponse;
import greendar.infra.gcp.storage.application.FileService;
import greendar.infra.gcp.storage.domain.InputFile;
import java.time.LocalDate;
import java.util.List;
import java.util.TreeMap;
Expand Down Expand Up @@ -74,7 +73,6 @@ public ApiResponse getPrivateTodoByMonthlyDate(@RequestHeader("Authorization") S
@PathVariable @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate date) {
Member member = memberService.findOneByToken(firebaseToken);
List<PrivateTodo> result = privateTodoService.getAllPrivateTodoByOneMonth(date,member);
System.out.println(result);
List<PrivateTodoResponse> collect = result.stream()
.map(r->new PrivateTodoResponse(r))
.collect(Collectors.toList());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import org.springframework.web.multipart.MultipartFile;

@RestController
@RequestMapping("/api/v1/files")
@RequestMapping("/files")
@RequiredArgsConstructor

public class StorageApi {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,11 @@ public FileDto uploadFile(MultipartFile file){
public List<InputFile> uploadFiles(MultipartFile[] files) {

List<InputFile> inputFiles = new ArrayList<>();

Arrays.asList(files).forEach(file -> {
String originalFileName = file.getOriginalFilename();
System.out.println("1111111");
System.out.println(originalFileName);
if(originalFileName == null){
throw new BadRequestException("Original file name is null");
}

try {
FileDto fileDto = dataBucketUtil.uploadFile(file, originalFileName,"test");
if (fileDto != null) {
Expand Down

0 comments on commit 08784f3

Please sign in to comment.