#6 Reverting unproper changes, adding support for both resource_uuid and sourcefileid in ImportLog model. Reflected changes on the database scripts.

Author: tigreped

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/ImportLogDAO.java

@@ -32,5 +32,5 @@ public interface ImportLogDAO {
 	 * Load the last inserted ImportLogModel for a specific resource_uuid
 	 * @return ImportLogModel or null if nothing is found
 	 */
-	public ImportLogModel loadLastFrom(String resource_uuid);
+	public ImportLogModel loadLastFrom(String sourceFileId);
 }

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/OccurrenceDAO.java

@@ -40,12 +40,12 @@ public interface OccurrenceDAO {
 
 	/**
 	 * Load a specific Occurrence into an OccurrenceModel
-	 * @param resource_uuid
+	 * @param sourceFileId
 	 * @param dwcaId
 	 * @param deepLoad Do we need to load the raw model?
 	 * @return
 	 */
-	public OccurrenceModel load(String resource_uuid, String dwcaId, boolean deepLoad);
+	public OccurrenceModel load(String sourceFileId, String dwcaId, boolean deepLoad);
 
 	/**
 	 * Load a specific Occurrence into an OccurrenceModel but only filled columns specified by columnList.

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/OccurrenceExtensionDAO.java

@@ -27,7 +27,7 @@ public interface OccurrenceExtensionDAO {
 	 * @param dwcaId
 	 * @return list of matching OccurrenceExtensionModel or empty list
 	 */
-	public List<OccurrenceExtensionModel> load(String extensionType, String resourceUUID, String dwcaId);
+	public List<OccurrenceExtensionModel> load(String extensionType, String sourcefileid, String dwcaId);
 
 	/**
 	 * Save a OccurrenceExtensionModel

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/impl/HibernateImportLogDAO.java

@@ -57,9 +57,9 @@ public ImportLogModel loadLast(){
 	}
 
 	@Override
-	public ImportLogModel loadLastFrom(String resource_uuid){
+	public ImportLogModel loadLastFrom(String sourceFileId){
 		Criteria c = sessionFactory.getCurrentSession().createCriteria(ImportLogModel.class);
-		c.add(Restrictions.eq(OccurrenceFieldConstants.RESOURCE_UUID, resource_uuid));
+		c.add(Restrictions.eq(OccurrenceFieldConstants.SOURCE_FILE_ID, sourceFileId));
 		c.addOrder(Order.desc(MANAGED_ID));
 		c.setMaxResults(1);
 		return (ImportLogModel)c.uniqueResult();

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/impl/HibernateOccurrenceDAO.java

@@ -91,9 +91,9 @@ public OccurrenceModel load(int auto_id, boolean deepLoad) {
 	}
 
 	@Override
-	public OccurrenceModel load(String resource_uuid, String dwcaId, boolean deepLoad){
+	public OccurrenceModel load(String sourceFileId, String dwcaId, boolean deepLoad){
 		Criteria searchCriteria = sessionFactory.getCurrentSession().createCriteria(OccurrenceModel.class);
-		searchCriteria.add(Restrictions.eq(OccurrenceFieldConstants.RESOURCE_UUID, resource_uuid));
+		searchCriteria.add(Restrictions.eq(OccurrenceFieldConstants.SOURCE_FILE_ID, sourceFileId));
 		searchCriteria.add(Restrictions.eq(OccurrenceFieldConstants.DWCA_ID, dwcaId));
 
 		if(deepLoad){

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/impl/HibernateOccurrenceExtensionDAO.java

@@ -51,11 +51,11 @@ public OccurrenceExtensionModel load(Long id) {
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public List<OccurrenceExtensionModel> load(String extensionType, String resourceUUID, String dwcaId) {
+	public List<OccurrenceExtensionModel> load(String extensionType, String sourcefileid, String dwcaId) {
 		Criteria searchCriteria = sessionFactory.getCurrentSession().createCriteria(OccurrenceExtensionModel.class);
 
 		searchCriteria.add(Restrictions.eq(EXTENSION_TYPE, extensionType));
-		searchCriteria.add(Restrictions.eq(OccurrenceFieldConstants.RESOURCE_UUID, resourceUUID));
+		searchCriteria.add(Restrictions.eq(OccurrenceFieldConstants.SOURCE_FILE_ID, sourcefileid));
 		searchCriteria.add(Restrictions.eq(OccurrenceFieldConstants.DWCA_ID, dwcaId));
 		return searchCriteria.list();
 	}

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/impl/HibernateResourceDAO.java

@@ -16,43 +16,44 @@
 
 @Repository("resourceDAO")
 public class HibernateResourceDAO implements ResourceDAO {
-	
-	//get log4j handler
+
+	// get log4j handler
 	private static final Logger LOGGER = Logger.getLogger(HibernateResourceDAO.class);
-	
+
 	@Autowired
 	private SessionFactory sessionFactory;
-	
+
 	@Override
-	public List<ResourceModel> loadResources(){
+	public List<ResourceModel> loadResources() {
 		Criteria searchCriteria = sessionFactory.getCurrentSession().createCriteria(ResourceModel.class);
 		return searchCriteria.list();
 	}
-	
+
 	@Override
 	public boolean save(ResourceModel resourceModel) {
-		try{
+		try {
 			sessionFactory.getCurrentSession().saveOrUpdate(resourceModel);
 		}
-		catch(HibernateException hEx){
+		catch (HibernateException hEx) {
 			LOGGER.fatal("Couldn't save ResourceModel", hEx);
 			return false;
 		}
 		return true;
 	}
 
 	@Override
-	public ResourceModel load(String resource_uuid) {
+	public ResourceModel load(String sourceFileId) {
 		Criteria searchCriteria = sessionFactory.getCurrentSession().createCriteria(ResourceModel.class);
-		searchCriteria.add(Restrictions.eq(OccurrenceFieldConstants.RESOURCE_UUID, resource_uuid));
-		return (ResourceModel)searchCriteria.uniqueResult();
+		searchCriteria.add(Restrictions.eq(OccurrenceFieldConstants.SOURCE_FILE_ID, sourceFileId));
+		return (ResourceModel) searchCriteria.uniqueResult();
 	}
-	
+
 	public SessionFactory getSessionFactory() {
 		return sessionFactory;
 	}
+
 	public void setSessionFactory(SessionFactory sessionFactory) {
 		this.sessionFactory = sessionFactory;
 	}
-	
+
 }

Diff for: src/main/java/net/canadensys/dataportal/occurrence/model/ImportLogModel.java

@@ -12,76 +12,92 @@
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-
 /**
  * Model to track the import of DwcA
+ * 
  * @author canadensys
  */
 @Entity
 @Table(name = "import_log")
-//allocationSize=1 is a workaround to avoid improper behavior
-//http://acodapella.blogspot.ca/2011/06/hibernate-annotation-postgresql.html
-@SequenceGenerator(name = "import_log_id_seq", sequenceName = "import_log_id_seq", allocationSize=1)
-public class ImportLogModel implements Serializable{
-	
+// allocationSize=1 is a workaround to avoid improper behavior
+// http://acodapella.blogspot.ca/2011/06/hibernate-annotation-postgresql.html
+@SequenceGenerator(name = "import_log_id_seq", sequenceName = "import_log_id_seq", allocationSize = 1)
+public class ImportLogModel implements Serializable {
+
 	private static final long serialVersionUID = 8675980642316964256L;
-	
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "import_log_id_seq")
 	private Integer id;
+	private String sourcefileid;
 	private String resource_uuid;
 	private Integer record_quantity;
 	private String updated_by;
 	private Integer import_process_duration_ms;
 	private Date event_end_date_time;
-	
+
 	public Integer getId() {
 		return id;
 	}
+
 	public void setId(Integer id) {
 		this.id = id;
 	}
-	
+
 	public Integer getRecord_quantity() {
 		return record_quantity;
 	}
+
 	public void setRecord_quantity(Integer record_quantity) {
 		this.record_quantity = record_quantity;
 	}
+
 	public String getUpdated_by() {
 		return updated_by;
 	}
+
 	public void setUpdated_by(String updated_by) {
 		this.updated_by = updated_by;
 	}
+
 	public Integer getImport_process_duration_ms() {
 		return import_process_duration_ms;
 	}
+
 	public void setImport_process_duration_ms(Integer import_process_duration_ms) {
 		this.import_process_duration_ms = import_process_duration_ms;
 	}
+
 	public Date getEvent_end_date_time() {
 		return event_end_date_time;
 	}
+
 	public void setEvent_end_date_time(Date event_end_date_time) {
 		this.event_end_date_time = event_end_date_time;
 	}
-	
+
 	public String toString() {
-		return new ToStringBuilder(this).
-	       append("id", id).
-	       append("resource_uuid", resource_uuid).
-	       append("recordQuantity", record_quantity).
-	       append("updated_by", updated_by).
-	       toString();
-	 }
+		return new ToStringBuilder(this).append("id", id).append("resource_uuid", resource_uuid).append("recordQuantity", record_quantity)
+				.append("updated_by", updated_by).toString();
+	}
+
 	public String getResource_uuid() {
 		return resource_uuid;
 	}
+
 	public void setResource_uuid(String resource_uuid) {
 		this.resource_uuid = resource_uuid;
 	}
+
 	public static long getSerialversionuid() {
 		return serialVersionUID;
 	}
+
+	public String getSourcefileid() {
+		return sourcefileid;
+	}
+
+	public void setSourcefileid(String sourcefileid) {
+		this.sourcefileid = sourcefileid;
+	}
 }

Diff for: src/main/java/net/canadensys/dataportal/occurrence/model/OccurrenceExtensionModel.java

@@ -10,68 +10,76 @@
 import org.hibernate.annotations.Type;
 
 /**
- * Model containing data related to a DarwinCore occurrence extension. Data are stored in a key/value map allowing to abstract specific extension columns.
+ * Model containing data related to a DarwinCore occurrence extension. Data are stored in a key/value map allowing to abstract specific extension
+ * columns.
+ * 
  * @author cgendreau
- *
+ * 
  */
 @Entity
 @Table(name = "occurrence_extension")
 public class OccurrenceExtensionModel {
-	
+
 	@Id
 	private long auto_id;
-	
+
 	@NaturalId
 	private String dwcaid;
 	@NaturalId
-	private String resource_uuid;
-	
+	private String sourcefileid;
+
 	private String ext_type;
 	private String ext_version;
-	
-	@Type(type="net.canadensys.databaseutils.hibernate.KeyValueType")
-	private Map<String,String> ext_data;
-		
+
+	@Type(type = "net.canadensys.databaseutils.hibernate.KeyValueType")
+	private Map<String, String> ext_data;
+
 	public long getAuto_id() {
 		return auto_id;
 	}
+
 	public void setAuto_id(long auto_id) {
 		this.auto_id = auto_id;
 	}
-	
+
 	public String getDwcaid() {
 		return dwcaid;
 	}
+
 	public void setDwcaid(String dwcaid) {
 		this.dwcaid = dwcaid;
 	}
-	
-	public String getResource_uuid() {
-		return resource_uuid;
-	}
-	public void setResource_uuid(String resource_uuid) {
-		this.resource_uuid = resource_uuid;
-	}
-	
+
 	public String getExt_type() {
 		return ext_type;
 	}
+
 	public void setExt_type(String ext_type) {
 		this.ext_type = ext_type;
 	}
-	
+
 	public String getExt_version() {
 		return ext_version;
 	}
+
 	public void setExt_version(String ext_version) {
 		this.ext_version = ext_version;
 	}
-	
-	public Map<String,String> getExt_data() {
+
+	public Map<String, String> getExt_data() {
 		return ext_data;
 	}
-	public void setExt_data(Map<String,String> ext_data) {
+
+	public void setExt_data(Map<String, String> ext_data) {
 		this.ext_data = ext_data;
 	}
 
+	public String getSourcefileid() {
+		return sourcefileid;
+	}
+
+	public void setSourcefileid(String sourcefileid) {
+		this.sourcefileid = sourcefileid;
+	}
+
 }

Diff for: src/main/java/net/canadensys/dataportal/occurrence/model/OccurrenceFieldConstants.java

@@ -2,12 +2,14 @@
 
 /**
  * Constants definitions for model fields(rows) name.
+ * 
  * @author cgendreau
- *
+ * 
  */
 public class OccurrenceFieldConstants {
-	
+
 	public static final String DWCA_ID = "dwcaid";
+	public static final String SOURCE_FILE_ID = "sourcefileid";
 	public static final String RESOURCE_UUID = "resource_uuid";
 
 }

Diff for: src/main/java/net/canadensys/dataportal/occurrence/model/OccurrenceModel.java

@@ -91,7 +91,7 @@ public class OccurrenceModel {
 	private String dwcaid;
 
 	// name of the file that was read
-	private String resource_uuid;
+	private String sourcefileid;
 
 	public int getAuto_id() {
 		return auto_id;
@@ -525,11 +525,11 @@ public void setDwcaid(String dwcaid) {
 		this.dwcaid = dwcaid;
 	}
 
-	public String getResource_uuid() {
-		return resource_uuid;
+	public String getSourcefileid() {
+		return sourcefileid;
 	}
 
-	public void setResource_uuid(String resource_uuid) {
-		this.resource_uuid = resource_uuid;
+	public void setSourcefileid(String sourcefileid) {
+		this.sourcefileid = sourcefileid;
 	}
 }