Skip to content
Snippets Groups Projects
Commit d4aeaf90 authored by AnnabelM7's avatar AnnabelM7
Browse files

pic info in db now

parent 58db0e79
No related branches found
No related tags found
No related merge requests found
Pipeline #48298 failed
......@@ -286,7 +286,7 @@ export default {
// Piltide üleslaadimise ja ID-de saamine
const uploadedImageIds = await this.uploadImages();
const uploadedImageIds = await this.uploadImages(result.id);
alertData.pictures = uploadedImageIds; // Lisa piltide ID-d alertData objektile
......@@ -335,7 +335,7 @@ export default {
},
async uploadImages() {
async uploadImages(ticketId) {
const uploadedImageIds = [];
try {
......@@ -368,6 +368,9 @@ export default {
// Lisa folderId POST-päringusse
formData.append('folderId', folderId);
// Lisa ticketId POST-päringusse
formData.append('ticketId', ticketId);
// Faili üleslaadimine
const response = await fetch('http://localhost:8080/api/uploadToDrive', {
method: 'POST',
......
......@@ -33,7 +33,9 @@ public class FileUploadController {
private TicketService ticketService;
@PostMapping("/uploadToDrive")
public ResponseEntity<Map<String, String>> uploadFileToDrive(@RequestParam("file") MultipartFile file, String folderId ) {
public ResponseEntity<Map<String, String>> uploadFileToDrive(@RequestParam("file") MultipartFile file,
String folderId,
@RequestParam("ticketId") UUID ticketId) {
try {
// Faili üleslaadimine Google Drive'i
String fileId = GoogleDriveService.uploadFile(file.getOriginalFilename(), file, folderId);
......@@ -45,9 +47,9 @@ public class FileUploadController {
pictureRepository.save(picture);
// Lisa pilt pileti külge (PictureToTicket seos) TODO!
// pictureToTicketService.addPictureToTicket(picture, ?????);
// Ticketi ja pildi sidumine
Ticket ticket = ticketService.getTicketById(ticketId);
pictureToTicketService.linkPictureToTicket(picture, ticket);
// Tagasta faili ID
......
......@@ -14,10 +14,10 @@ public class PictureToTicketService {
this.pictureToTicketRepository = pictureToTicketRepository;
}
public PictureToTicket addPictureToTicket(Picture picture, Ticket ticket) {
public void linkPictureToTicket(Picture picture, Ticket ticket) {
PictureToTicket pictureToTicket = new PictureToTicket();
pictureToTicket.setPicture(picture);
pictureToTicket.setTicket(ticket);
return pictureToTicketRepository.save(pictureToTicket);
pictureToTicketRepository.save(pictureToTicket);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment