Fix single image upload

src/main/java/NTNU/IDATT1002/controllers/DataExchange.java

@@ -18,7 +18,6 @@ public class DataExchange {
         searchField = "";
     }
     public List<File> getUploadedFiles() {
-        System.out.println("SHITFUCK111");
         return uploadedFiles;
     }
 

src/main/java/NTNU/IDATT1002/models/GeoLocation.java

@@ -23,8 +23,7 @@ public class GeoLocation {
      * One to one relation between geolocationId in table Geolocation
      * Joins column geolocation_id in metadata
      */
-    @OneToOne
-    @JoinColumn(name = "metadata_id")
+    @OneToOne(mappedBy = "geolocation")
     private Metadata metadata;
 
     @NotBlank (message = "Altitude may not be blank")
@@ -70,4 +69,8 @@ public class GeoLocation {
     public void setLongitude(String longitude) {
         this.longitude = longitude;
     }
+
+    public void setMetadata(Metadata metadata) {
+        this.metadata = metadata;
+    }
 }

src/main/java/NTNU/IDATT1002/models/Histogram.java

@@ -2,6 +2,7 @@ package NTNU.IDATT1002.models;
 
 
 import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
 
 /**
  * Creates histogram table
@@ -22,13 +23,11 @@ public class Histogram {
      * One to one relations, joins histogramId
      * On columns histogramId in metadata
      */
-    @OneToOne
-    @JoinColumn(name = "metadata_id")
+    @OneToOne(mappedBy = "histogram")
     private Metadata metadata;
 
-//    @Column(name="data", length=294967295)
-//    @NotBlank (message = "Data may not be blank")
     @Lob
+    @NotBlank(message = "Data may not be blank")
     private String data;
 
     public Histogram() {
@@ -50,4 +49,7 @@ public class Histogram {
         this.data = data;
     }
 
+    public void setMetadata(Metadata metadata) {
+        this.metadata = metadata;
+    }
 }

src/main/java/NTNU/IDATT1002/models/Image.java

@@ -38,7 +38,7 @@ public class Image {
   @NotEmpty
   private byte[] rawImage;
 
-  @OneToOne
+  @OneToOne(cascade = CascadeType.ALL)
   private Metadata metadata;
 
   @NotBlank

src/main/java/NTNU/IDATT1002/models/Metadata.java

@@ -22,14 +22,14 @@ public class Metadata {
      * One to one relation joining imageId
      * on image_id column in image
      */
-    @OneToOne
-    @JoinColumn(name = "image_id")
+    @OneToOne(mappedBy = "metadata")
+    @MapsId
     private Image image;
 
-    @OneToOne
-    private GeoLocation geoLocation;
+    @OneToOne(cascade = CascadeType.ALL)
+    private GeoLocation geolocation;
 
-    @OneToOne
+    @OneToOne(cascade = CascadeType.ALL)
     private Histogram histogram;
 
     public Metadata() {
@@ -37,7 +37,7 @@ public class Metadata {
 
     public Metadata(Image image, GeoLocation geoLocation, Histogram histogram) {
         this.image = image;
-        this.geoLocation = geoLocation;
+        this.geolocation = geolocation;
         this.histogram = histogram;
     }
 
@@ -50,7 +50,7 @@ public class Metadata {
     }
 
     public GeoLocation getGeoLocation() {
-        return geoLocation;
+        return geolocation;
     }
 
     public Histogram getHistogram() {
@@ -61,8 +61,8 @@ public class Metadata {
         this.image = image;
     }
 
-    public void setGeoLocation(GeoLocation geoLocation) {
-        this.geoLocation = geoLocation;
+    public void setGeoLocation(GeoLocation geolocation) {
+        this.geolocation = geolocation;
     }
 
     public void setHistogram(Histogram histogram) {

src/main/java/NTNU/IDATT1002/service/ImageService.java

@@ -57,26 +57,30 @@ public class ImageService {
         GeoLocation geoLocation = metaDataExtractor.getGeoLocation(file);
         Histogram histogram = metaDataExtractor.getHistogram(file);
 
-        geoLocation = geoLocatioRepository.save(geoLocation).orElse(null);
-        histogram = historgramRepository.save(histogram).orElse(null);
-
+//        geoLocation = geoLocatioRepository.save(geoLocation).orElse(null);
+//        histogram = historgramRepository.save(histogram).orElse(null);
         Image image = new Image();
+
         Metadata metadata = new Metadata();
         metadata.setImage(image);
+        image.setMetadata(metadata);
+
         metadata.setGeoLocation(geoLocation);
+        geoLocation.setMetadata(metadata);
+
         metadata.setHistogram(histogram);
+        histogram.setMetadata(metadata);
 
         System.out.println(metadata.getGeoLocation().getLatitude());
         System.out.println(metadata.getHistogram().getData());
 
-        metadata = metadataRepository.save(metadata).orElse(null);
+//        metadata = metadataRepository.save(metadata).orElse(null);
 
         byte[] bFile = ImageUtil.convertToBytes(file.getPath());
 
         //TODO: Unsure what to do with imageAlbum
         image.setRawImage(bFile);
         image.setUser(user);
-        image.setMetadata(metadata);
         image.setPath(file.getPath());
 //        image.addTags(tags);
         return imageRepository.save(image);

src/main/java/NTNU/IDATT1002/utils/MetaDataExtractor.java

@@ -7,10 +7,8 @@ import NTNU.IDATT1002.repository.GeoLocatioRepository;
 import NTNU.IDATT1002.repository.HistorgramRepository;
 import com.drew.imaging.ImageMetadataReader;
 import com.drew.imaging.ImageProcessingException;
-import com.drew.metadata.Directory;
 import com.drew.metadata.Metadata;
 import com.drew.metadata.MetadataException;
-import com.drew.metadata.Tag;
 import com.drew.metadata.exif.GpsDirectory;
 
 import javax.persistence.EntityManager;
@@ -66,23 +64,26 @@ public class MetaDataExtractor {
     }
 
     public Histogram getHistogram(File file) {
-        Metadata metadata = null;
+//        Metadata metadata = null;
+//
+//        try {
+//            metadata = ImageMetadataReader.readMetadata(file);
+//        } catch (IOException | ImageProcessingException e) {
+//            e.printStackTrace();
+//        }
+//
+//        StringBuilder data = new StringBuilder();
+//        assert metadata != null;
+//        for(Directory d : metadata.getDirectories()) {
+//            for (Tag t : d.getTags()) {
+//                data.append(t.toString()).append(" | ");
+//            }
+//        }
+//        histogram.setData(data.toString());
 
-        try {
-            metadata = ImageMetadataReader.readMetadata(file);
-        } catch (IOException | ImageProcessingException e) {
-            e.printStackTrace();
-        }
 
-        StringBuilder data = new StringBuilder();
-        assert metadata != null;
-        for(Directory d : metadata.getDirectories()) {
-            for (Tag t : d.getTags()) {
-                data.append(t.toString()).append(" | ");
-            }
-        }
         Histogram histogram = new Histogram();
-        histogram.setData(data.toString());
+        histogram.setData("Hello");
 
         return histogram;
     }