dev #1

Open
backdev wants to merge 47 commits from dev into main
2 changed files with 10 additions and 3 deletions
Showing only changes of commit 7c4843a081 - Show all commits
@@ -1,6 +1,7 @@
package ru.soune.nocopy.adminpanel.client; package ru.soune.nocopy.adminpanel.client;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.core.io.Resource;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
@@ -23,6 +24,6 @@ public interface DashBoardAppClient {
@PostMapping("api/internal/data-control") @PostMapping("api/internal/data-control")
Map<String, Object> internalDataControl(@RequestBody BaseRequest request); Map<String, Object> internalDataControl(@RequestBody BaseRequest request);
@GetMapping("api/internal/data-download/{fileId}") @GetMapping("/internal/data-download/{fileId}")
public ResponseEntity<StreamingResponseBody> download(@PathVariable String fileId); ResponseEntity<Resource> download(@PathVariable String fileId);
} }
@@ -1,8 +1,10 @@
package ru.soune.nocopy.adminpanel.controller; package ru.soune.nocopy.adminpanel.controller;
import feign.FeignException;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import ru.soune.nocopy.adminpanel.client.DashBoardAppClient; import ru.soune.nocopy.adminpanel.client.DashBoardAppClient;
@@ -128,6 +130,10 @@ public class AdminController {
.build()); .build());
} }
return dashBoardAppClient.download(fileId); try {
return dashBoardAppClient.download(fileId);
} catch (FeignException.NotFound e) {
return ResponseEntity.notFound().build();
}
} }
} }