Merge remote-tracking branch 'origin/develop' into develop

Author: svenruppert

pom.xml

@@ -130,6 +130,12 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
     </dependency>
+    
+    <!-- Utils -->
+    <dependency>
+    	<groupId>org.apache.commons</groupId>
+    	<artifactId>commons-lang3</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

src/main/java/org/openherbarium/webapp/model/Metadata.java

@@ -0,0 +1,110 @@
+package org.openherbarium.webapp.model;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+public class Metadata {
+
+  public static final String TAXON_NAME = "Taxon";
+  public static final String RECORDER = "Finder";
+  public static final String DETERMINER = "Bestimmer";
+  public static final String DATE = "Datum";
+  public static final String SCANS = "Scans";
+
+  private long id;
+  private String externalId;
+  private String taxonName;
+  private Person recorder;
+  private Person determiner;
+  private LocalDate date;
+  private Set<Scan> scans;
+
+  public Metadata() {
+    super();
+  }
+
+  public Metadata(long id, String externalId, String taxonName, Person recorder, Person determiner,
+      LocalDate date, Set<Scan> scans) {
+    super();
+    this.id = id;
+    this.externalId = externalId;
+    this.taxonName = taxonName;
+    this.recorder = recorder;
+    this.determiner = determiner;
+    this.date = date;
+    this.scans = scans;
+  }
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public String getExternalId() {
+    return externalId;
+  }
+
+  public void setExternalId(String externalId) {
+    this.externalId = externalId;
+  }
+
+  public String getTaxonName() {
+    return taxonName;
+  }
+
+  public void setTaxonName(String taxonName) {
+    this.taxonName = taxonName;
+  }
+
+  public Person getRecorder() {
+    return recorder;
+  }
+
+  public void setRecorder(Person recorder) {
+    this.recorder = recorder;
+  }
+
+  public Person getDeterminer() {
+    return determiner;
+  }
+
+  public void setDeterminer(Person determiner) {
+    this.determiner = determiner;
+  }
+
+  public Set<Scan> getScans() {
+    return scans;
+  }
+
+  public void setScans(Set<Scan> scans) {
+    this.scans = scans;
+  }
+
+  public LocalDate getDate() {
+    return date;
+  }
+
+  public void setDate(LocalDate date) {
+    this.date = date;
+  }
+
+  public Scan fetchDefaultScan() {
+    return fetchScansAsSortedList().get(0);
+  }
+
+  public List<Scan> fetchScansAsSortedList() {
+    final Set<Scan> scans = getScans();
+    if (scans != null && !scans.isEmpty()) {
+      final List<Scan> scansList = new ArrayList<>(scans);
+      Collections.sort(scansList);
+      return scansList;
+    }
+    return new ArrayList<>();
+  }
+}

src/main/java/org/openherbarium/webapp/model/MetadataFilter.java

@@ -0,0 +1,60 @@
+package org.openherbarium.webapp.model;
+
+import java.time.LocalDate;
+
+public class MetadataFilter {
+  private String taxon;
+  private String determiner;
+  private String recorder;
+  private LocalDate from;
+  private LocalDate to;
+
+  public MetadataFilter(String taxon, String determiner, String recorder, LocalDate from,
+      LocalDate to) {
+    this.taxon = taxon;
+    this.determiner = determiner;
+    this.recorder = recorder;
+    this.from = from;
+    this.to = to;
+  }
+
+  public String getDeterminer() {
+    return determiner;
+  }
+
+  public LocalDate getFrom() {
+    return from;
+  }
+
+  public String getRecorder() {
+    return recorder;
+  }
+
+  public String getTaxon() {
+    return taxon;
+  }
+
+  public LocalDate getTo() {
+    return to;
+  }
+
+  public void setDeterminer(String determiner) {
+    this.determiner = determiner;
+  }
+
+  public void setFrom(LocalDate from) {
+    this.from = from;
+  }
+
+  public void setRecorder(String recorder) {
+    this.recorder = recorder;
+  }
+
+  public void setTaxon(String taxon) {
+    this.taxon = taxon;
+  }
+
+  public void setTo(LocalDate to) {
+    this.to = to;
+  }
+}

src/main/java/org/openherbarium/webapp/model/MetadataService.java

@@ -0,0 +1,15 @@
+package org.openherbarium.webapp.model;
+
+import java.util.List;
+
+public interface MetadataService {
+
+  public enum SortField {
+    RECORDER, DETERMINER, DATE, TAXON
+  }
+
+  public List<Metadata> find(SortField sortField, SortOrder sortOrder, int limit, int offset,
+      MetadataFilter metadataFilter);
+
+  public long count(MetadataFilter metadataFilter);
+}

src/main/java/org/openherbarium/webapp/model/Person.java

@@ -0,0 +1,40 @@
+package org.openherbarium.webapp.model;
+
+import java.util.Comparator;
+
+public class Person implements Comparable<Person> {
+  public Person() {
+    super();
+  }
+
+  public Person(String firstName, String lastName) {
+    super();
+    this.firstName = firstName;
+    this.lastName = lastName;
+  }
+
+  private String firstName;
+  private String lastName;
+
+  public String getFirstName() {
+    return firstName;
+  }
+
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  public String getLastName() {
+    return lastName;
+  }
+
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  @Override
+  public int compareTo(Person person2) {
+    return Comparator.comparing(Person::getLastName).thenComparing(Person::getFirstName)
+        .compare(this, person2);
+  }
+}

src/main/java/org/openherbarium/webapp/model/Scan.java

@@ -0,0 +1,37 @@
+package org.openherbarium.webapp.model;
+
+public class Scan implements Comparable<Scan> {
+  private long id;
+  private String name;
+
+  public Scan() {
+    super();
+  }
+
+  public Scan(long id, String name) {
+    super();
+    this.id = id;
+    this.name = name;
+  }
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public int compareTo(Scan scan) {
+    return name.compareTo(scan.getName());
+  }
+}

src/main/java/org/openherbarium/webapp/model/SortOrder.java

@@ -0,0 +1,5 @@
+package org.openherbarium.webapp.model;
+
+public enum SortOrder {
+  ASC, DESC
+}