bcgov · anissa-agahchen · Oct 19, 2021 · Oct 19, 2021 · Oct 19, 2021 · Oct 19, 2021
diff --git a/database/src/migrations/20210225205948_biohub_release.ts b/database/src/migrations/20210225205948_biohub_release.ts
@@ -5,7 +5,7 @@ import path from 'path';
 const DB_USER_API_PASS = process.env.DB_USER_API_PASS;
 const DB_USER_API = process.env.DB_USER_API;
 
-const DB_RELEASE = 'release.0.33';
+const DB_RELEASE = 'release.0.34';
 
 /**
  * Apply biohub release changes.

diff --git a/...0.33/api_delete_occurrence_submission.sql → ...0.34/api_delete_occurrence_submission.sql b/...0.33/api_delete_occurrence_submission.sql → ...0.34/api_delete_occurrence_submission.sql
diff --git a/...tions/release.0.33/api_delete_project.sql → ...tions/release.0.34/api_delete_project.sql b/...tions/release.0.33/api_delete_project.sql → ...tions/release.0.34/api_delete_project.sql
diff --git a/...ations/release.0.33/api_delete_survey.sql → ...ations/release.0.34/api_delete_survey.sql b/...ations/release.0.33/api_delete_survey.sql → ...ations/release.0.34/api_delete_survey.sql
diff --git a/...3/api_get_context_system_user_role_id.sql → ...4/api_get_context_system_user_role_id.sql b/...3/api_get_context_system_user_role_id.sql → ...4/api_get_context_system_user_role_id.sql
diff --git a/.../release.0.33/api_get_context_user_id.sql → .../release.0.34/api_get_context_user_id.sql b/.../release.0.33/api_get_context_user_id.sql → .../release.0.34/api_get_context_user_id.sql
diff --git a/...release.0.33/api_get_eml_data_package.sql → ...release.0.34/api_get_eml_data_package.sql b/...release.0.33/api_get_eml_data_package.sql → ...release.0.34/api_get_eml_data_package.sql
diff --git a/.../release.0.33/api_get_system_constant.sql → .../release.0.34/api_get_system_constant.sql b/.../release.0.33/api_get_system_constant.sql → .../release.0.34/api_get_system_constant.sql
diff --git a/...0.33/api_get_system_metadata_constant.sql → ...0.34/api_get_system_metadata_constant.sql b/...0.33/api_get_system_metadata_constant.sql → ...0.34/api_get_system_metadata_constant.sql
diff --git a/...grations/release.0.33/api_set_context.sql → ...grations/release.0.34/api_set_context.sql b/...grations/release.0.33/api_set_context.sql → ...grations/release.0.34/api_set_context.sql
diff --git a/...elease.0.33/api_user_is_administrator.sql → ...elease.0.34/api_user_is_administrator.sql b/...elease.0.33/api_user_is_administrator.sql → ...elease.0.34/api_user_is_administrator.sql
diff --git a/...s/release.0.33/api_xml_string_replace.sql → ...s/release.0.34/api_xml_string_replace.sql b/...s/release.0.33/api_xml_string_replace.sql → ...s/release.0.34/api_xml_string_replace.sql
diff --git a/...se/src/migrations/release.0.33/biohub.sql → ...se/src/migrations/release.0.34/biohub.sql b/...se/src/migrations/release.0.33/biohub.sql → ...se/src/migrations/release.0.34/biohub.sql
@@ -2,7 +2,7 @@
 -- ER/Studio Data Architect SQL Code Generation
 -- Project :      BioHub.DM1
 --
--- Date Created : Tuesday, October 12, 2021 13:51:48
+-- Date Created : Tuesday, October 19, 2021 11:05:37
 -- Target DBMS : PostgreSQL 10.x-12.x
 --
 
@@ -679,6 +679,7 @@ CREATE TABLE occurrence(
     occurrence_submission_id    integer                     NOT NULL,
     taxonid                     varchar(3000),
     lifestage                   varchar(3000),
+    sex                         varchar(3000),
     vernacularname              varchar(3000),
     eventdate                   TIMESTAMPTZ                 NOT NULL,
     individualcount             varchar(3000),
@@ -706,6 +707,8 @@ COMMENT ON COLUMN occurrence.taxonid IS 'A string representation of the value pr
 ;
 COMMENT ON COLUMN occurrence.lifestage IS 'A string representation of the value provided for the given Darwin Core term.'
 ;
+COMMENT ON COLUMN occurrence.sex IS 'A string representation of the value provided for the given Darwin Core term.'
+;
 COMMENT ON COLUMN occurrence.vernacularname IS 'A string representation of the value provided for the given Darwin Core term.'
 ;
 COMMENT ON COLUMN occurrence.eventdate IS 'A datetime representation of the value provided for the given Darwin Core term.'
@@ -3312,16 +3315,16 @@ CREATE INDEX "Ref185170" ON occurrence_data_package(data_package_id)
 CREATE INDEX "Ref169174" ON occurrence_data_package(occurrence_id)
 ;
 -- 
--- INDEX: "Ref153160" 
+-- INDEX: "Ref192188" 
 --
 
-CREATE INDEX "Ref153160" ON occurrence_submission(survey_id)
+CREATE INDEX "Ref192188" ON occurrence_submission(template_methodology_species_id)
 ;
 -- 
--- INDEX: "Ref192188" 
+-- INDEX: "Ref153160" 
 --
 
-CREATE INDEX "Ref192188" ON occurrence_submission(template_methodology_species_id)
+CREATE INDEX "Ref153160" ON occurrence_submission(survey_id)
 ;
 -- 
 -- INDEX: occurrence_submission_data_package_uk1 
@@ -3678,16 +3681,16 @@ CREATE UNIQUE INDEX summary_submission_message_type_nuk1 ON summary_submission_m
 CREATE INDEX "Ref215206" ON summary_submission_message_type(summary_submission_message_class_id)
 ;
 -- 
--- INDEX: "Ref45147" 
+-- INDEX: "Ref190190" 
 --
 
-CREATE INDEX "Ref45147" ON survey(project_id)
+CREATE INDEX "Ref190190" ON survey(common_survey_methodology_id)
 ;
 -- 
--- INDEX: "Ref190190" 
+-- INDEX: "Ref45147" 
 --
 
-CREATE INDEX "Ref190190" ON survey(common_survey_methodology_id)
+CREATE INDEX "Ref45147" ON survey(project_id)
 ;
 -- 
 -- INDEX: "Ref153168" 
@@ -3971,16 +3974,16 @@ ALTER TABLE occurrence_data_package ADD CONSTRAINT "Refoccurrence174"
 -- TABLE: occurrence_submission 
 --
 
-ALTER TABLE occurrence_submission ADD CONSTRAINT "Refsurvey160" 
-    FOREIGN KEY (survey_id)
-    REFERENCES survey(survey_id)
-;
-
 ALTER TABLE occurrence_submission ADD CONSTRAINT "Reftemplate_methodology_species188" 
     FOREIGN KEY (template_methodology_species_id)
     REFERENCES template_methodology_species(template_methodology_species_id)
 ;
 
+ALTER TABLE occurrence_submission ADD CONSTRAINT "Refsurvey160" 
+    FOREIGN KEY (survey_id)
+    REFERENCES survey(survey_id)
+;
+
 
 -- 
 -- TABLE: occurrence_submission_data_package 
@@ -4266,16 +4269,16 @@ ALTER TABLE summary_submission_message_type ADD CONSTRAINT "Refsummary_submissio
 -- TABLE: survey 
 --
 
-ALTER TABLE survey ADD CONSTRAINT "Refproject147" 
-    FOREIGN KEY (project_id)
-    REFERENCES project(project_id)
-;
-
 ALTER TABLE survey ADD CONSTRAINT "Refcommon_survey_methodology190" 
     FOREIGN KEY (common_survey_methodology_id)
     REFERENCES common_survey_methodology(common_survey_methodology_id)
 ;
 
+ALTER TABLE survey ADD CONSTRAINT "Refproject147" 
+    FOREIGN KEY (project_id)
+    REFERENCES project(project_id)
+;
+
 
 -- 
 -- TABLE: survey_attachment 

diff --git a/...lease.0.33/create_spatial_extensions.psql → ...lease.0.34/create_spatial_extensions.psql b/...lease.0.33/create_spatial_extensions.psql → ...lease.0.34/create_spatial_extensions.psql
diff --git a/...ations/release.0.33/dapi_custom_views.sql → ...ations/release.0.34/dapi_custom_views.sql b/...ations/release.0.33/dapi_custom_views.sql → ...ations/release.0.34/dapi_custom_views.sql
diff --git a/...c/migrations/release.0.33/db_setup_up.sql → ...c/migrations/release.0.34/db_setup_up.sql b/...c/migrations/release.0.33/db_setup_up.sql → ...c/migrations/release.0.34/db_setup_up.sql
diff --git a/...ations/release.0.33/populate_activity.sql → ...ations/release.0.34/populate_activity.sql b/...ations/release.0.33/populate_activity.sql → ...ations/release.0.34/populate_activity.sql
diff --git a/...e_administrative_activity_status_type.sql → ...e_administrative_activity_status_type.sql b/...e_administrative_activity_status_type.sql → ...e_administrative_activity_status_type.sql
diff --git a/...populate_administrative_activity_type.sql → ...populate_administrative_activity_type.sql b/...populate_administrative_activity_type.sql → ...populate_administrative_activity_type.sql
diff --git a/...3/populate_climate_change_initiatives.sql → ...4/populate_climate_change_initiatives.sql b/...3/populate_climate_change_initiatives.sql → ...4/populate_climate_change_initiatives.sql
diff --git a/...33/populate_common_survey_methodology.sql → ...34/populate_common_survey_methodology.sql b/...33/populate_common_survey_methodology.sql → ...34/populate_common_survey_methodology.sql
diff --git a/...s/release.0.33/populate_first_nations.sql → ...s/release.0.34/populate_first_nations.sql b/...s/release.0.33/populate_first_nations.sql → ...s/release.0.34/populate_first_nations.sql
diff --git a/.../release.0.33/populate_funding_source.sql → .../release.0.34/populate_funding_source.sql b/.../release.0.33/populate_funding_source.sql → .../release.0.34/populate_funding_source.sql
diff --git a/...3/populate_investment_action_category.sql → ...4/populate_investment_action_category.sql b/...3/populate_investment_action_category.sql → ...4/populate_investment_action_category.sql
diff --git a/...se.0.33/populate_iucn_classifications.sql → ...se.0.34/populate_iucn_classifications.sql b/...se.0.33/populate_iucn_classifications.sql → ...se.0.34/populate_iucn_classifications.sql
diff --git a/....0.33/populate_management_action_type.sql → ....0.34/populate_management_action_type.sql b/....0.33/populate_management_action_type.sql → ....0.34/populate_management_action_type.sql
diff --git a/...ns/release.0.33/populate_project_role.sql → ...ns/release.0.34/populate_project_role.sql b/...ns/release.0.33/populate_project_role.sql → ...ns/release.0.34/populate_project_role.sql
diff --git a/...ns/release.0.33/populate_project_type.sql → ...ns/release.0.34/populate_project_type.sql b/...ns/release.0.33/populate_project_type.sql → ...ns/release.0.34/populate_project_type.sql
diff --git a/...release.0.33/populate_proprietor_type.sql → ...release.0.34/populate_proprietor_type.sql b/...release.0.33/populate_proprietor_type.sql → ...release.0.34/populate_proprietor_type.sql
diff --git a/....33/populate_submission_message_class.sql → ....34/populate_submission_message_class.sql b/....33/populate_submission_message_class.sql → ....34/populate_submission_message_class.sql
diff --git a/...0.33/populate_submission_message_type.sql → ...0.34/populate_submission_message_type.sql b/...0.33/populate_submission_message_type.sql → ...0.34/populate_submission_message_type.sql
diff --git a/....0.33/populate_submission_status_type.sql → ....0.34/populate_submission_status_type.sql b/....0.33/populate_submission_status_type.sql → ....0.34/populate_submission_status_type.sql
diff --git a/....0.33/populate_summary_parameter_code.sql → ....0.34/populate_summary_parameter_code.sql b/....0.33/populate_summary_parameter_code.sql → ....0.34/populate_summary_parameter_code.sql
diff --git a/...late_summary_submission_message_class.sql → ...late_summary_submission_message_class.sql b/...late_summary_submission_message_class.sql → ...late_summary_submission_message_class.sql
diff --git a/...ulate_summary_submission_message_type.sql → ...ulate_summary_submission_message_type.sql b/...ulate_summary_submission_message_type.sql → ...ulate_summary_submission_message_type.sql
diff --git a/...release.0.33/populate_system_constant.sql → ...release.0.34/populate_system_constant.sql b/...release.0.33/populate_system_constant.sql → ...release.0.34/populate_system_constant.sql
diff --git a/....33/populate_system_metadata_constant.sql → ....34/populate_system_metadata_constant.sql b/....33/populate_system_metadata_constant.sql → ....34/populate_system_metadata_constant.sql
diff --git a/...ons/release.0.33/populate_system_role.sql → ...ons/release.0.34/populate_system_role.sql b/...ons/release.0.33/populate_system_role.sql → ...ons/release.0.34/populate_system_role.sql
diff --git a/...ations/release.0.33/populate_template.sql → ...ations/release.0.34/populate_template.sql b/...ations/release.0.33/populate_template.sql → ...ations/release.0.34/populate_template.sql
diff --git a/...populate_template_methodology_species.sql → ...populate_template_methodology_species.sql b/...populate_template_methodology_species.sql → ...populate_template_methodology_species.sql
diff --git a/...se.0.33/populate_user_identity_source.sql → ...se.0.34/populate_user_identity_source.sql b/...se.0.33/populate_user_identity_source.sql → ...se.0.34/populate_user_identity_source.sql
diff --git a/...ease.0.33/populate_wldtaxonomic_units.sql → ...ease.0.34/populate_wldtaxonomic_units.sql b/...ease.0.33/populate_wldtaxonomic_units.sql → ...ease.0.34/populate_wldtaxonomic_units.sql
diff --git a/...s/release.0.33/project_audit_triggers.sql → ...s/release.0.34/project_audit_triggers.sql b/...s/release.0.33/project_audit_triggers.sql → ...s/release.0.34/project_audit_triggers.sql
diff --git a/...tions/release.0.33/project_dapi_views.sql → ...tions/release.0.34/project_dapi_views.sql b/...tions/release.0.33/project_dapi_views.sql → ...tions/release.0.34/project_dapi_views.sql
diff --git a/...release.0.33/project_journal_triggers.sql → ...release.0.34/project_journal_triggers.sql b/...release.0.33/project_journal_triggers.sql → ...release.0.34/project_journal_triggers.sql
diff --git a/...ations/release.0.33/smoketest_release.sql → ...ations/release.0.34/smoketest_release.sql b/...ations/release.0.33/smoketest_release.sql → ...ations/release.0.34/smoketest_release.sql
@@ -153,7 +153,7 @@ begin
   insert into occurrence_submission (survey_id, source, event_timestamp) values (_survey_id, 'BIOHUB BATCH', now()-interval '1 day') returning occurrence_submission_id into _occurrence_submission_id;
   select count(1) into _count from occurrence_submission;
   assert _count = 1, 'FAIL occurrence_submission';
-  insert into occurrence (occurrence_submission_id, taxonid, lifestage, eventdate) values (_occurrence_submission_id, 'M-ALAL', 'Adult', now()-interval '10 day');
+  insert into occurrence (occurrence_submission_id, taxonid, lifestage, eventdate, sex) values (_occurrence_submission_id, 'M-ALAL', 'Adult', now()-interval '10 day', 'male');
   select count(1) into _count from occurrence;
   assert _count = 1, 'FAIL occurrence';
   insert into submission_status (occurrence_submission_id, submission_status_type_id, event_timestamp) values (_occurrence_submission_id, (select submission_status_type_id from submission_status_type where name = 'Submitted'), now()-interval '1 day') returning submission_status_id into _submission_status_id;
@@ -166,7 +166,7 @@ begin
   insert into occurrence_submission (survey_id, source, event_timestamp) values (_survey_id, 'BIOHUB BATCH', now()) returning occurrence_submission_id into _occurrence_submission_id;
   select count(1) into _count from occurrence_submission;
   assert _count = 2, 'FAIL occurrence_submission';
-  insert into occurrence (occurrence_submission_id, taxonid, lifestage, eventdate) values (_occurrence_submission_id, 'M-ALAL', 'Adult', now()-interval '5 day');
+  insert into occurrence (occurrence_submission_id, taxonid, lifestage, eventdate, sex) values (_occurrence_submission_id, 'M-ALAL', 'Adult', now()-interval '5 day', 'female');
   select count(1) into _count from occurrence;
   assert _count = 2, 'FAIL occurrence';
   insert into submission_status (occurrence_submission_id, submission_status_type_id, event_timestamp) values (_occurrence_submission_id, (select submission_status_type_id from submission_status_type where name = 'Submitted'), now()) returning submission_status_id into _submission_status_id;

diff --git a/...rations/release.0.33/tr_audit_trigger.sql → ...rations/release.0.34/tr_audit_trigger.sql b/...rations/release.0.33/tr_audit_trigger.sql → ...rations/release.0.34/tr_audit_trigger.sql
diff --git a/...tions/release.0.33/tr_journal_trigger.sql → ...tions/release.0.34/tr_journal_trigger.sql b/...tions/release.0.33/tr_journal_trigger.sql → ...tions/release.0.34/tr_journal_trigger.sql
diff --git a/...release.0.33/tr_occurrence_submission.sql → ...release.0.34/tr_occurrence_submission.sql b/...release.0.33/tr_occurrence_submission.sql → ...release.0.34/tr_occurrence_submission.sql
diff --git a/...src/migrations/release.0.33/tr_permit.sql → ...src/migrations/release.0.34/tr_permit.sql b/...src/migrations/release.0.33/tr_permit.sql → ...src/migrations/release.0.34/tr_permit.sql
diff --git a/...rc/migrations/release.0.33/tr_project.sql → ...rc/migrations/release.0.34/tr_project.sql b/...rc/migrations/release.0.33/tr_project.sql → ...rc/migrations/release.0.34/tr_project.sql
diff --git a/...elease.0.33/tr_project_funding_source.sql → ...elease.0.34/tr_project_funding_source.sql b/...elease.0.33/tr_project_funding_source.sql → ...elease.0.34/tr_project_funding_source.sql
diff --git a/...src/migrations/release.0.33/tr_survey.sql → ...src/migrations/release.0.34/tr_survey.sql b/...src/migrations/release.0.33/tr_survey.sql → ...src/migrations/release.0.34/tr_survey.sql
diff --git a/...ons/release.0.33/tr_survey_proprietor.sql → ...ons/release.0.34/tr_survey_proprietor.sql b/...ons/release.0.33/tr_survey_proprietor.sql → ...ons/release.0.34/tr_survey_proprietor.sql
diff --git a/...rations/release.0.33/vw_survey_status.sql → ...rations/release.0.34/vw_survey_status.sql b/...rations/release.0.33/vw_survey_status.sql → ...rations/release.0.34/vw_survey_status.sql