Merge pull request #7 from Canadensys/liger_issue6

Fixed issue #6

Author: cgendreau

Diff for: script/migrations/occurrence/2.10.0_to_2.11.0.sql

@@ -4,4 +4,6 @@ ALTER TABLE occurrence_extension ADD COLUMN sourcefileid character varying(50);
 ALTER TABLE occurrence_extension ADD COLUMN resource_uuid character varying(50);
 
 --This table should be empty but if not please, transfer the content of 'id' into 'auto_id' and then delete the 'id' column
-ALTER TABLE occurrence_extension DROP COLUMN IF EXISTS id;
+ALTER TABLE occurrence_extension DROP COLUMN IF EXISTS id;
+
+ALTER TABLE resource_management RENAME key TO resource_uuid;

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

@@ -20,7 +20,7 @@ public class ResourceModel {
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "resource_management_id_seq")
 	private Integer id;
 	private String name;
-	private String key;
+	private String resource_uuid;
 	private String archive_url;
 	private String sourcefileid;
 
@@ -31,18 +31,20 @@ public void setId(Integer id) {
 		this.id = id;
 	}
 
+	public String getResource_uuid() {
+		return resource_uuid;
+	}
+	public void setResource_uuid(String resource_uuid) {
+		this.resource_uuid = resource_uuid;
+	}
+	
 	public String getName() {
 		return name;
 	}
 	public void setName(String name) {
 		this.name = name;
 	}
-	public String getKey() {
-		return key;
-	}
-	public void setKey(String key) {
-		this.key = key;
-	}
+
 	public String getArchive_url() {
 		return archive_url;
 	}

Diff for: src/main/resources/script/occurrence/create_occurrence_tables.sql

@@ -283,7 +283,7 @@ CREATE TABLE IF NOT EXISTS resource_management
   id integer DEFAULT nextval('resource_management_id_seq') NOT NULL,
   sourcefileid character varying(50),
   name character varying(255),
-  key character varying(36),
+  resource_uuid character varying(36),
   archive_url character varying(255),
   CONSTRAINT resource_management_pkey PRIMARY KEY ( id ),
   CONSTRAINT resource_management_source_file_id_key UNIQUE (sourcefileid)

Diff for: src/test/java/net/canadensys/dataportal/occurrence/dao/ResourceDAOTest.java

@@ -31,7 +31,7 @@ public void testSaveAndLoad(){
 		ResourceModel testModel = new ResourceModel();
 
 		testModel.setSourcefileid("test_sourcefileid");
-		testModel.setKey("12345");
+		testModel.setResource_uuid("12345");
 		assertTrue(resourceDAO.save(testModel));
 
 		int id = testModel.getId();