Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feedback for ticket 1289 #464

Merged
merged 9 commits into from
Aug 20, 2021
Merged

feedback for ticket 1289 #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
13e84d4
feedback 1
sdevalapurkar Aug 20, 2021
4410295
db changes
sdevalapurkar Aug 20, 2021
7d89ed4
feedback 2
sdevalapurkar Aug 20, 2021
a27b201
Merge branch 'dev' into BHBC-1289-v2
sdevalapurkar Aug 20, 2021
021f641
build
sdevalapurkar Aug 20, 2021
31b6aae
Merge branch 'BHBC-1289-v2' of https://github.com/bcgov/biohubbc into…
sdevalapurkar Aug 20, 2021
8109367
fix
sdevalapurkar Aug 20, 2021
3b23010
fix migration
sdevalapurkar Aug 20, 2021
79bd8ee
fix
sdevalapurkar Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/paths/project/{projectId}/survey/{surveyId}/observation/submission/get.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export function getOccurenceSubmission(): RequestHandler {
!occurrenceSubmissionData ||
!occurrenceSubmissionData.rows ||
!occurrenceSubmissionData.rows[0] ||
occurrenceSubmissionData.rows[0].soft_delete_timestamp
occurrenceSubmissionData.rows[0].delete_timestamp
) {
return res.status(200).json(null);
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/queries/survey/survey-occurrence-queries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export const getLatestSurveyOccurrenceSubmissionSQL = (surveyId: number): SQLSta
os.occurrence_submission_id as id,
os.survey_id,
os.source,
os.soft_delete_timestamp,
os.delete_timestamp,
os.event_timestamp,
os.key,
os.file_name,
Expand Down Expand Up @@ -246,7 +246,7 @@ export const deleteOccurrenceSubmissionSQL = (occurrenceSubmissionId: number): S

const sqlStatement: SQLStatement = SQL`
UPDATE occurrence_submission
SET soft_delete_timestamp = now()
SET delete_timestamp = now()
WHERE occurrence_submission_id = ${occurrenceSubmissionId};
`;

Expand Down
7 changes: 2 additions & 5 deletions app/src/features/surveys/view/SurveyObservations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,8 @@ const SurveyObservations = () => {
const [isLoading, setIsLoading] = useState(true);
const [isValidating, setIsValidating] = useState(false);
const [isPolling, setIsPolling] = useState(false);

const [pollingFunction, setPollingFunction] = useState<Function>();
const [pollingTime, setPollingTime] = useState<number | null>(0);

useInterval(pollingFunction, pollingTime);

const dialogContext = useContext(DialogContext);

const fetchObservationSubmission = useCallback(async () => {
Expand Down Expand Up @@ -107,14 +103,15 @@ const SurveyObservations = () => {
});
}, [biohubApi.observation, projectId, surveyId]);

useInterval(fetchObservationSubmission, pollingTime);

useEffect(() => {
if (isLoading) {
fetchObservationSubmission();
}

if (isPolling && !pollingTime) {
setPollingTime(2000);
setPollingFunction(() => fetchObservationSubmission);
}
}, [
biohubApi,
Expand Down
62 changes: 62 additions & 0 deletions database/src/migrations/20210819170006_add_delete_timestamp_to_occurrence_submission.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import * as Knex from 'knex';

const DB_SCHEMA = process.env.DB_SCHEMA;

export async function up(knex: Knex): Promise<void> {
await knex.raw(`
set schema '${DB_SCHEMA}';
set search_path = ${DB_SCHEMA},public;

ALTER TABLE ${DB_SCHEMA}.occurrence_submission add column delete_timestamp timestamptz(6);

create or replace view survey_status as
with not_published as (select os.survey_id, max(ss.submission_status_id) as submission_status_id from occurrence_submission os, submission_status ss
where not exists (select 1 from submission_status ss2, submission_status_type sst, occurrence_submission os2
where os.survey_id = os2.survey_id
and os2.delete_timestamp is null
and ss2.occurrence_submission_id = os2.occurrence_submission_id
and sst.submission_status_type_id = ss2.submission_status_type_id
and sst.name = api_get_character_system_constant('OCCURRENCE_SUBMISSION_STATE_PUBLISHED')
and sst.record_end_date is null)
group by os.survey_id),
published as (select os.survey_id, max(ss.submission_status_id) as submission_status_id from occurrence_submission os, submission_status ss, submission_status_type sst
where ss.submission_status_type_id = sst.submission_status_type_id
and sst.name = api_get_character_system_constant('OCCURRENCE_SUBMISSION_STATE_PUBLISHED')
and sst.record_end_date is null
and os.delete_timestamp is null
group by os.survey_id)
select s.project_id project_id, np.survey_id survey_id, sst.name survey_status, ss3.event_timestamp status_event_timestamp from not_published np, submission_status ss3, submission_status_type sst, survey s
where ss3.submission_status_id = np.submission_status_id
and sst.submission_status_type_id = ss3.submission_status_type_id
and s.survey_id = np.survey_id
union
select s.project_id project_id, p.survey_id survey_id, sst.name survey_status, ss3.event_timestamp status_event_timestamp from published p, submission_status ss3, submission_status_type sst, survey s
where ss3.submission_status_id = p.submission_status_id
and sst.submission_status_type_id = ss3.submission_status_type_id
and s.survey_id = p.survey_id
;

set search_path = biohub_dapi_v1;

set role biohub_api;

create or replace view occurrence_submission as select * from ${DB_SCHEMA}.occurrence_submission;

set role postgres;
`);
}

export async function down(knex: Knex): Promise<void> {
await knex.raw(`
SET SCHEMA '${DB_SCHEMA}';
SET SEARCH_PATH = ${DB_SCHEMA},public, biohub_dapi_v1;

SET ROLE biohub_api;

create or replace view occurrence_submission as select * from ${DB_SCHEMA}.occurrence_submission;

SET ROLE postgres;

ALTER TABLE ${DB_SCHEMA}.occurrence_submission remove column delete_timestamp;
`);
}
35 changes: 0 additions & 35 deletions database/src/migrations/20210819170006_add_soft_delete_timestamp_to_occurrence_submission.ts
View file
Open in desktop

This file was deleted.

50 changes: 25 additions & 25 deletions database/src/migrations/release.0.22/vw_survey_status.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
-- vw_survey_status.sql
create or replace view survey_status as
with not_published as (select os.survey_id, max(ss.submission_status_id) as submission_status_id from occurrence_submission os, submission_status ss
where not exists (select 1 from submission_status ss2, submission_status_type sst, occurrence_submission os2
where os2.survey_id = os2.survey_id
and ss2.occurrence_submission_id = os2.occurrence_submission_id
and sst.submission_status_type_id = ss2.submission_status_type_id
and sst.name = api_get_character_system_constant('OCCURRENCE_SUBMISSION_STATE_PUBLISHED')
and sst.record_end_date is null)
group by os.survey_id),
published as (select os.survey_id, max(ss.submission_status_id) as submission_status_id from occurrence_submission os, submission_status ss, submission_status_type sst
where ss.submission_status_type_id = sst.submission_status_type_id
and sst.name = api_get_character_system_constant('OCCURRENCE_SUBMISSION_STATE_PUBLISHED')
and sst.record_end_date is null
group by os.survey_id)
select s.project_id project_id, np.survey_id survey_id, sst.name survey_status, ss3.event_timestamp status_event_timestamp from not_published np, submission_status ss3, submission_status_type sst, survey s
where ss3.submission_status_id = np.submission_status_id
and sst.submission_status_type_id = ss3.submission_status_type_id
and s.survey_id = np.survey_id
union
select s.project_id project_id, p.survey_id survey_id, sst.name survey_status, ss3.event_timestamp status_event_timestamp from published p, submission_status ss3, submission_status_type sst, survey s
where ss3.submission_status_id = p.submission_status_id
and sst.submission_status_type_id = ss3.submission_status_type_id
and s.survey_id = p.survey_id
-- vw_survey_status.sql

create or replace view survey_status as
with not_published as (select os.survey_id, max(ss.submission_status_id) as submission_status_id from occurrence_submission os, submission_status ss
where not exists (select 1 from submission_status ss2, submission_status_type sst, occurrence_submission os2
where os2.survey_id = os2.survey_id
and ss2.occurrence_submission_id = os2.occurrence_submission_id
and sst.submission_status_type_id = ss2.submission_status_type_id
and sst.name = api_get_character_system_constant('OCCURRENCE_SUBMISSION_STATE_PUBLISHED')
and sst.record_end_date is null)
group by os.survey_id),
published as (select os.survey_id, max(ss.submission_status_id) as submission_status_id from occurrence_submission os, submission_status ss, submission_status_type sst
where ss.submission_status_type_id = sst.submission_status_type_id
and sst.name = api_get_character_system_constant('OCCURRENCE_SUBMISSION_STATE_PUBLISHED')
and sst.record_end_date is null
group by os.survey_id)
select s.project_id project_id, np.survey_id survey_id, sst.name survey_status, ss3.event_timestamp status_event_timestamp from not_published np, submission_status ss3, submission_status_type sst, survey s
where ss3.submission_status_id = np.submission_status_id
and sst.submission_status_type_id = ss3.submission_status_type_id
and s.survey_id = np.survey_id
union
select s.project_id project_id, p.survey_id survey_id, sst.name survey_status, ss3.event_timestamp status_event_timestamp from published p, submission_status ss3, submission_status_type sst, survey s
where ss3.submission_status_id = p.submission_status_id
and sst.submission_status_type_id = ss3.submission_status_type_id
and s.survey_id = p.survey_id
;