diff --git a/CHANGELOG.md b/CHANGELOG.md index d67b74c8..86ed422b 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Renamed DAR -> DER form. Renamed Submit Data to ESDIS form to DAR - Updated the language for Open Data Policy questions in DAR and DER - Removing terraform references to edpub_metrics_s3_bucket +- Removing unused database tables and references to them ## 1.1.0 diff --git a/src/nodejs/lambda-layers/database-util/src/query/group.js b/src/nodejs/lambda-layers/database-util/src/query/group.js index 441006ec..82ac27d2 100755 --- a/src/nodejs/lambda-layers/database-util/src/query/group.js +++ b/src/nodejs/lambda-layers/database-util/src/query/group.js @@ -1,7 +1,7 @@ const sql = require('./sql-builder.js'); const table = 'edpgroup'; -const allFields = ['id', 'short_name', 'long_name', 'description', 'permissions', 'subscriptions']; +const allFields = ['id', 'short_name', 'long_name', 'description']; const fieldMap = { id: 'edpgroup.id', short_name: 'edpgroup.short_name', @@ -11,48 +11,6 @@ const fieldMap = { user_id: 'edpuser_edpgroup.edpuser_id', group_id: 'edpuser_edpgroup.edpgroup_id', users: 'users', - permissions: { - type: 'coalesce', - src: 'permissions', - fallback: '\'[]\'::JSONB', - alias: 'permissions' - }, - subscriptions: { - type: 'json_obj', - keys: [ - ['action', { - type: 'coalesce', - src: 'subscriptions_action', - fallback: '\'[]\'::JSONB' - }], - ['daac', { - type: 'coalesce', - src: 'subscriptions_daac', - fallback: '\'[]\'::JSONB' - }], - ['form', { - type: 'coalesce', - src: 'subscriptions_form', - fallback: '\'[]\'::JSONB' - }], - ['service', { - type: 'coalesce', - src: 'subscriptions_service', - fallback: '\'[]\'::JSONB' - }], - ['submission', { - type: 'coalesce', - src: 'subscriptions_submission', - fallback: '\'[]\'::JSONB' - }], - ['workflow', { - type: 'coalesce', - src: 'subscriptions_workflow', - fallback: '\'[]\'::JSONB' - }] - ], - alias: 'subscriptions' - }, // action, daac, form, service, submission workflow group_agg: { type: 'json_agg', src: { @@ -73,132 +31,6 @@ const fieldMap = { }; const fields = (list) => list.map((field) => fieldMap[field]); const refs = { - group_permission_submission: { - type: 'left_join', - src: { - type: 'select', - fields: [ - 'edpgroup_permission_submission.edpgroup_id', - { - type: 'json_agg', - src: 'edpgroup_permission_submission.submission_id', - alias: 'permissions' - } - ], - from: { base: 'edpgroup_permission_submission' }, - group: 'edpgroup_permission_submission.edpgroup_id', - alias: 'permission_agg' - }, - on: { left: 'permission_agg.edpgroup_id', right: fieldMap.id } - }, - group_subscription_action: { - type: 'left_join', - src: { - type: 'select', - fields: [ - 'edpgroup_id', - { - type: 'json_agg', - src: 'edpgroup_subscription_action.action_id', - alias: 'subscriptions_action' - } - ], - from: { base: 'edpgroup_subscription_action' }, - group: 'edpgroup_id', - alias: 'subscription_action_agg' - }, - on: { left: 'subscription_action_agg.edpgroup_id', right: fieldMap.id } - }, - group_subscription_daac: { - type: 'left_join', - src: { - type: 'select', - fields: [ - 'edpgroup_id', - { - type: 'json_agg', - src: 'edpgroup_subscription_daac.daac_id', - alias: 'subscriptions_daac' - } - ], - from: { base: 'edpgroup_subscription_daac' }, - group: 'edpgroup_id', - alias: 'subscription_daac_agg' - }, - on: { left: 'subscription_daac_agg.edpgroup_id', right: fieldMap.id } - }, - group_subscription_form: { - type: 'left_join', - src: { - type: 'select', - fields: [ - 'edpgroup_id', - { - type: 'json_agg', - src: 'edpgroup_subscription_form.form_id', - alias: 'subscriptions_form' - } - ], - from: { base: 'edpgroup_subscription_form' }, - group: 'edpgroup_id', - alias: 'subscription_form_agg' - }, - on: { left: 'subscription_form_agg.edpgroup_id', right: fieldMap.id } - }, - group_subscription_service: { - type: 'left_join', - src: { - type: 'select', - fields: [ - 'edpgroup_id', - { - type: 'json_agg', - src: 'edpgroup_subscription_service.service_id', - alias: 'subscriptions_service' - } - ], - from: { base: 'edpgroup_subscription_service' }, - group: 'edpgroup_id', - alias: 'subscription_service_agg' - }, - on: { left: 'subscription_service_agg.edpgroup_id', right: fieldMap.id } - }, - group_subscription_submission: { - type: 'left_join', - src: { - type: 'select', - fields: [ - 'edpgroup_id', - { - type: 'json_agg', - src: 'edpgroup_subscription_submission.submission_id', - alias: 'subscriptions_submission' - } - ], - from: { base: 'edpgroup_subscription_submission' }, - group: 'edpgroup_id', - alias: 'subscription_submission_agg' - }, - on: { left: 'subscription_submission_agg.edpgroup_id', right: fieldMap.id } - }, - group_subscription_workflow: { - type: 'left_join', - src: { - type: 'select', - fields: [ - 'edpgroup_id', - { - type: 'json_agg', - src: 'edpgroup_subscription_workflow.workflow_id', - alias: 'subscriptions_workflow' - } - ], - from: { base: 'edpgroup_subscription_workflow' }, - group: 'edpgroup_id', - alias: 'subscription_workflow_agg' - }, - on: { left: 'subscription_workflow_agg.edpgroup_id', right: fieldMap.id } - }, user_group: { type: 'left_join', src: 'edpuser_edpgroup', @@ -237,36 +69,14 @@ const findAll = ({ short_name, long_name, sort, order, per_page, page }) => sql. }); const findById = () => sql.select({ fields: fields(allFields), - from: { - base: table, - joins: [ - refs.group_permission_submission, - refs.group_subscription_action, - refs.group_subscription_daac, - refs.group_subscription_form, - refs.group_subscription_service, - refs.group_subscription_submission, - refs.group_subscription_workflow - ] - }, + from: { base: table }, where: { filters: [ { field: fieldMap.id, param: 'id' } ] } }); const findByName = (params) => sql.select({ fields: fields(allFields), - from: { - base: table, - joins: [ - refs.group_permission_submission, - refs.group_subscription_action, - refs.group_subscription_daac, - refs.group_subscription_form, - refs.group_subscription_service, - refs.group_subscription_submission, - refs.group_subscription_workflow - ] - }, + from: { base: table }, where: { filters: [ ...(short_name ? [{ field: 'edpgroup.short_name', like: 'short_name' }] : []), diff --git a/src/nodejs/lambda-layers/database-util/src/query/submission.js b/src/nodejs/lambda-layers/database-util/src/query/submission.js index e6a4aa3d..7efb303d 100755 --- a/src/nodejs/lambda-layers/database-util/src/query/submission.js +++ b/src/nodejs/lambda-layers/database-util/src/query/submission.js @@ -3,10 +3,10 @@ const sql = require('./sql-builder.js'); const workflow = require('./workflow.js'); const table = 'submission'; -// const allFields = ['id', 'name', 'user_id', 'daac_id', 'conversation_id', 'workflow_id', 'workflow_name', 'step_name', 'status', 'forms', 'action_data', 'form_data', 'metadata', 'created_at', 'last_change', 'lock']; +// const allFields = ['id', 'name', 'user_id', 'daac_id', 'conversation_id', 'workflow_id', 'workflow_name', 'step_name', 'status', 'forms', 'action_data', 'form_data', 'metadata', 'created_at', 'last_change']; -const allFields = ['id', 'name', 'initiator', 'workflow_id', 'hidden', 'conversation_id', 'workflow_name', 'daac_id', 'daac_name', 'code', 'assigned_daacs', 'step_data', 'step_status_label', 'step_name', 'status', 'forms', 'action_data', 'form_data', 'metadata', 'created_at', 'last_change', 'lock', 'contributor_ids', 'copy', 'origin_id']; -const customFields = ['id', 'name', 'data_producer_name', 'initiator', 'workflow_id', 'hidden', 'conversation_id', 'workflow_name', 'daac_id', 'daac_name', 'step_data', 'step_status_label', 'step_name', 'status', 'created_at', 'last_change', 'lock', 'contributor_ids', 'copy', 'origin_id']; +const allFields = ['id', 'name', 'initiator', 'workflow_id', 'hidden', 'conversation_id', 'workflow_name', 'daac_id', 'daac_name', 'code', 'assigned_daacs', 'step_data', 'step_status_label', 'step_name', 'status', 'forms', 'action_data', 'form_data', 'metadata', 'created_at', 'last_change', 'contributor_ids', 'copy', 'origin_id']; +const customFields = ['id', 'name', 'data_producer_name', 'initiator', 'workflow_id', 'hidden', 'conversation_id', 'workflow_name', 'daac_id', 'daac_name', 'step_data', 'step_status_label', 'step_name', 'status', 'created_at', 'last_change', 'contributor_ids', 'copy', 'origin_id']; const fieldMap = { id: 'submission.id', @@ -30,7 +30,6 @@ const fieldMap = { metadata: 'submission_metadata.metadata', created_at: 'submission.created_at', last_change: 'submission_status.last_change', - lock: '(EXISTS(SELECT edpuser_id FROM submission_lock WHERE submission_lock.id = submission.id)) "lock"', contributor_ids: 'submission.contributor_ids', copy: '(EXISTS(SELECT edpuser_id FROM submission_copy WHERE submission_copy.id = submission.id)) "copy"', origin_id: 'submission_copy.origin_id', diff --git a/src/nodejs/lambda-layers/database-util/src/query/user.js b/src/nodejs/lambda-layers/database-util/src/query/user.js index 9d51dc37..11a0c483 100755 --- a/src/nodejs/lambda-layers/database-util/src/query/user.js +++ b/src/nodejs/lambda-layers/database-util/src/query/user.js @@ -3,7 +3,7 @@ const role = require('./role.js'); const group = require('./group.js'); const table = 'edpuser'; -const allFields = ['id', 'name', 'email', 'registered', 'last_login', 'user_groups', 'user_roles', 'permissions', 'user_privileges', 'subscriptions', 'detailed']; +const allFields = ['id', 'name', 'email', 'registered', 'last_login', 'user_groups', 'user_roles', 'user_privileges', 'detailed']; const fieldMap = { id: 'edpuser.id', name: 'edpuser.name', @@ -30,43 +30,6 @@ const fieldMap = { fallback: '\'[]\'::JSONB', alias: 'user_privileges' }, - permissions: { - type: 'coalesce', - src: 'permissions', - fallback: '\'[]\'::JSONB', - alias: 'permissions' - }, - subscriptions: { - type: 'json_obj', - keys: [ - ['action', { - type: 'coalesce', - src: 'subscriptions_action', - fallback: '\'[]\'::JSONB' - }], - ['form', { - type: 'coalesce', - src: 'subscriptions_form', - fallback: '\'[]\'::JSONB' - }], - ['service', { - type: 'coalesce', - src: 'subscriptions_service', - fallback: '\'[]\'::JSONB' - }], - ['submission', { - type: 'coalesce', - src: 'subscriptions_submission', - fallback: '\'[]\'::JSONB' - }], - ['workflow', { - type: 'coalesce', - src: 'subscriptions_workflow', - fallback: '\'[]\'::JSONB' - }] - ], - alias: 'subscriptions' - }, detailed: 'edpuser.detailed' }; const fields = (list) => list.map((field) => fieldMap[field]); @@ -100,114 +63,6 @@ const refs = { type: 'left_join', src: 'edpuser_edprole', on: { left: fieldMap.id, right: 'edpuser_edprole.edpuser_id' } - }, - user_permission_submission: { - type: 'left_join', - src: { - type: 'select', - fields: [ - 'edpuser_permission_submission.edpuser_id', - { - type: 'json_agg', - src: 'edpuser_permission_submission.submission_id', - alias: 'permissions' - } - ], - from: { base: 'edpuser_permission_submission' }, - group: 'edpuser_permission_submission.edpuser_id', - alias: 'permission_agg' - }, - on: { left: 'permission_agg.edpuser_id', right: fieldMap.id } - }, - user_subscription_action: { - type: 'left_join', - src: { - type: 'select', - fields: [ - 'edpuser_id', - { - type: 'json_agg', - src: 'edpuser_subscription_action.action_id', - alias: 'subscriptions_action' - } - ], - from: { base: 'edpuser_subscription_action' }, - group: 'edpuser_id', - alias: 'subscription_action_agg' - }, - on: { left: 'subscription_action_agg.edpuser_id', right: fieldMap.id } - }, - user_subscription_form: { - type: 'left_join', - src: { - type: 'select', - fields: [ - 'edpuser_id', - { - type: 'json_agg', - src: 'edpuser_subscription_form.form_id', - alias: 'subscriptions_form' - } - ], - from: { base: 'edpuser_subscription_form' }, - group: 'edpuser_id', - alias: 'subscription_form_agg' - }, - on: { left: 'subscription_form_agg.edpuser_id', right: fieldMap.id } - }, - user_subscription_service: { - type: 'left_join', - src: { - type: 'select', - fields: [ - 'edpuser_id', - { - type: 'json_agg', - src: 'edpuser_subscription_service.service_id', - alias: 'subscriptions_service' - } - ], - from: { base: 'edpuser_subscription_service' }, - group: 'edpuser_id', - alias: 'subscription_service_agg' - }, - on: { left: 'subscription_service_agg.edpuser_id', right: fieldMap.id } - }, - user_subscription_submission: { - type: 'left_join', - src: { - type: 'select', - fields: [ - 'edpuser_id', - { - type: 'json_agg', - src: 'edpuser_subscription_submission.submission_id', - alias: 'subscriptions_submission' - } - ], - from: { base: 'edpuser_subscription_submission' }, - group: 'edpuser_id', - alias: 'subscription_submission_agg' - }, - on: { left: 'subscription_submission_agg.edpuser_id', right: fieldMap.id } - }, - user_subscription_workflow: { - type: 'left_join', - src: { - type: 'select', - fields: [ - 'edpuser_id', - { - type: 'json_agg', - src: 'edpuser_subscription_workflow.workflow_id', - alias: 'subscriptions_workflow' - } - ], - from: { base: 'edpuser_subscription_workflow' }, - group: 'edpuser_id', - alias: 'subscription_workflow_agg' - }, - on: { left: 'subscription_workflow_agg.edpuser_id', right: fieldMap.id } } }; @@ -217,13 +72,7 @@ const find = ({ id, name, email, sort, order, per_page, page }) => sql.select({ base: table, joins: [ refs.group, - refs.role, - refs.user_permission_submission, - refs.user_subscription_action, - refs.user_subscription_form, - refs.user_subscription_service, - refs.user_subscription_submission, - refs.user_subscription_workflow + refs.role ] }, ...(id || name || email ? { @@ -301,13 +150,7 @@ const findById = () => sql.select({ base: table, joins: [ refs.group, - refs.role, - refs.user_permission_submission, - refs.user_subscription_action, - refs.user_subscription_form, - refs.user_subscription_service, - refs.user_subscription_submission, - refs.user_subscription_workflow + refs.role ] }, where: { diff --git a/src/nodejs/lambda-layers/schema-util/src/models/group-details.js b/src/nodejs/lambda-layers/schema-util/src/models/group-details.js deleted file mode 100644 index 347a018a..00000000 --- a/src/nodejs/lambda-layers/schema-util/src/models/group-details.js +++ /dev/null @@ -1,43 +0,0 @@ -module.exports.model = (path) => ({ - description: 'Fields for a form with a collection of sections containing questions.', - type: 'object', - allOf: [{ $ref: `#${path}Group` }], - properties: { - permissions: { - type: 'array', - items: {} - }, - subscriptions: { - type: 'object', - properties: { - daac: { - type: 'array', - items: {} - }, - form: { - type: 'array', - items: {} - }, - action: { - type: 'array', - items: {} - }, - service: { - type: 'array', - items: {} - }, - workflow: { - type: 'array', - items: {} - }, - submission: { - type: 'array', - items: {} - } - } - } - } - -}); - -module.exports.refs = ['UUID', 'Group']; diff --git a/src/nodejs/lambda-layers/schema-util/src/models/index.js b/src/nodejs/lambda-layers/schema-util/src/models/index.js index 30fe34bf..df99729e 100755 --- a/src/nodejs/lambda-layers/schema-util/src/models/index.js +++ b/src/nodejs/lambda-layers/schema-util/src/models/index.js @@ -19,7 +19,6 @@ const FormUpdate = require('./form-update.js'); const Group = require('./group.js'); const GetPartUrl = require('./get-part-url.js'); const GetPartUrlResponse = require('./get-part-url-response.js'); -const GroupDetails = require('./group-details.js'); const Id = require('./id.js'); const Note = require('./note.js'); const NoteAddViewers = require('./note-add-viewers.js'); @@ -119,7 +118,6 @@ const models = { FormSections, FormUpdate, Group, - GroupDetails, GetPartUrl, GetPartUrlResponse, Id, diff --git a/src/nodejs/lambda-layers/schema-util/src/models/submission-operation-all.js b/src/nodejs/lambda-layers/schema-util/src/models/submission-operation-all.js index c40cd2d4..f6e66afd 100755 --- a/src/nodejs/lambda-layers/schema-util/src/models/submission-operation-all.js +++ b/src/nodejs/lambda-layers/schema-util/src/models/submission-operation-all.js @@ -43,7 +43,6 @@ module.exports.model = (path) => ({ metadata: { type: 'object' }, created_at: { type: 'string' }, last_change: { type: 'string' }, - lock: { type: 'boolean' }, contributor_ids: { type: 'array', items: { type: 'string' } diff --git a/src/nodejs/lambda-layers/schema-util/src/models/submission-operation-custom-response.js b/src/nodejs/lambda-layers/schema-util/src/models/submission-operation-custom-response.js index 17e7ac61..ed071bab 100644 --- a/src/nodejs/lambda-layers/schema-util/src/models/submission-operation-custom-response.js +++ b/src/nodejs/lambda-layers/schema-util/src/models/submission-operation-custom-response.js @@ -25,7 +25,6 @@ module.exports.model = (path) => ({ status: { type: 'string' }, created_at: { type: 'string' }, last_change: { type: 'string' }, - lock: { type: 'boolean' }, contributor_ids: { type: 'array', items: { type: 'string' } diff --git a/src/nodejs/lambda-layers/schema-util/src/models/user-all-fields.js b/src/nodejs/lambda-layers/schema-util/src/models/user-all-fields.js index e1bc8bfc..7d332ee3 100644 --- a/src/nodejs/lambda-layers/schema-util/src/models/user-all-fields.js +++ b/src/nodejs/lambda-layers/schema-util/src/models/user-all-fields.js @@ -15,15 +15,10 @@ module.exports.model = (path) => ({ type: 'array', items: { $ref: `#${path}Role` } }, - permissions: { - type: 'array', - items: { type: 'string' } - }, user_privileges: { type: 'array', items: { type: 'string' } }, - subscriptions: { type: 'object' }, detailed: { type: 'boolean' } } }); diff --git a/src/openapi/openapi.json b/src/openapi/openapi.json index b435eca9..a1e8eda3 100755 --- a/src/openapi/openapi.json +++ b/src/openapi/openapi.json @@ -1186,7 +1186,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/GroupDetails" + "$ref": "#/components/schemas/Group" } } } diff --git a/src/postgres/2-tables.sql b/src/postgres/2-tables.sql index 5df9191f..b7dbb4ba 100755 --- a/src/postgres/2-tables.sql +++ b/src/postgres/2-tables.sql @@ -10,8 +10,6 @@ DROP TABLE IF EXISTS input CASCADE; DROP TABLE IF EXISTS action CASCADE; -DROP TABLE IF EXISTS module CASCADE; - DROP TABLE IF EXISTS service CASCADE; DROP TABLE IF EXISTS service_secret CASCADE; @@ -20,8 +18,6 @@ DROP TABLE IF EXISTS edpuser CASCADE; DROP TABLE IF EXISTS edpgroup CASCADE; -DROP TABLE IF EXISTS edpgroup_parent CASCADE; - DROP TABLE IF EXISTS edprole CASCADE; DROP TABLE IF EXISTS edpuser_edpgroup CASCADE; @@ -60,38 +56,10 @@ DROP TABLE IF EXISTS submission_form_data CASCADE; DROP TABLE IF EXISTS submission_form_data_pool CASCADE; -DROP TABLE IF EXISTS submission_lock CASCADE; - DROP TABLE IF EXISTS submission_copy CASCADE; DROP TABLE IF EXISTS submission_metrics CASCADE; -DROP TABLE IF EXISTS edpuser_permission_submission CASCADE; - -DROP TABLE IF EXISTS edpgroup_permission_submission CASCADE; - -DROP TABLE IF EXISTS edpuser_subscription_action CASCADE; - -DROP TABLE IF EXISTS edpuser_subscription_form CASCADE; - -DROP TABLE IF EXISTS edpuser_subscription_service CASCADE; - -DROP TABLE IF EXISTS edpuser_subscription_submission CASCADE; - -DROP TABLE IF EXISTS edpuser_subscription_workflow CASCADE; - -DROP TABLE IF EXISTS edpgroup_subscription_action CASCADE; - -DROP TABLE IF EXISTS edpgroup_subscription_daac CASCADE; - -DROP TABLE IF EXISTS edpgroup_subscription_form CASCADE; - -DROP TABLE IF EXISTS edpgroup_subscription_service CASCADE; - -DROP TABLE IF EXISTS edpgroup_subscription_submission CASCADE; - -DROP TABLE IF EXISTS edpgroup_subscription_workflow CASCADE; - DROP TABLE IF EXISTS edprole_privilege CASCADE; DROP TABLE IF EXISTS privilege CASCADE; @@ -187,18 +155,6 @@ CREATE TABLE IF NOT EXISTS action ( UNIQUE (short_name, version) ); -CREATE TABLE IF NOT EXISTS module ( - id UUID DEFAULT UUID_GENERATE_V4(), - short_name VARCHAR NOT NULL, - long_name VARCHAR NOT NULL, - description VARCHAR NOT NULL, - arn VARCHAR NOT NULL, - has_interface BOOLEAN NOT NULL, - created_at TIMESTAMP NOT NULL DEFAULT NOW(), - PRIMARY KEY (id), - UNIQUE (short_name) -); - CREATE TABLE IF NOT EXISTS service ( id UUID DEFAULT UUID_GENERATE_V4(), short_name VARCHAR NOT NULL, @@ -236,14 +192,6 @@ CREATE TABLE IF NOT EXISTS edpgroup ( UNIQUE (long_name) ); -CREATE TABLE IF NOT EXISTS edpgroup_parent ( - id UUID NOT NULL, - parent_id UUID NOT NULL, - PRIMARY KEY (id, parent_id), - FOREIGN KEY (id) REFERENCES edpgroup (id), - FOREIGN KEY (parent_id) REFERENCES edpgroup (id) -); - CREATE TABLE IF NOT EXISTS edprole ( id UUID DEFAULT UUID_GENERATE_V4(), short_name VARCHAR NOT NULL, @@ -414,16 +362,6 @@ CREATE TABLE IF NOT EXISTS submission_form_data ( FOREIGN KEY (data) REFERENCES submission_form_data_pool (id) ); -CREATE TABLE IF NOT EXISTS submission_lock ( - id UUID NOT NULL, - edpuser_id UUID, - context VARCHAR DEFAULT 'none', - created_at TIMESTAMP DEFAULT NOW(), - PRIMARY KEY (id), - FOREIGN KEY (id) REFERENCES submission (id), - FOREIGN KEY (edpuser_id) REFERENCES edpuser (id) -); - CREATE TABLE IF NOT EXISTS submission_copy ( id UUID NOT NULL, edpuser_id UUID NOT NULL, @@ -466,21 +404,6 @@ CREATE TABLE IF NOT EXISTS service_secret ( FOREIGN KEY (submission_id) REFERENCES submission (id) ); -CREATE TABLE IF NOT EXISTS edpuser_permission_submission ( - edpuser_id UUID NOT NULL, - submission_id UUID NOT NULL, - PRIMARY KEY (edpuser_id, submission_id), - FOREIGN KEY (edpuser_id) REFERENCES edpuser (id), - FOREIGN KEY (submission_id) REFERENCES submission (id) -); - -CREATE TABLE IF NOT EXISTS edpgroup_permission_submission ( - edpgroup_id UUID NOT NULL, - submission_id UUID NOT NULL, - PRIMARY KEY (edpgroup_id, submission_id), - FOREIGN KEY (submission_id) REFERENCES submission (id) -); - CREATE TABLE IF NOT EXISTS privilege ( privilege VARCHAR NOT NULL, PRIMARY KEY (privilege) @@ -494,92 +417,6 @@ CREATE TABLE IF NOT EXISTS edprole_privilege ( FOREIGN KEY (privilege) REFERENCES privilege (privilege) ); -CREATE TABLE IF NOT EXISTS edpuser_subscription_action ( - edpuser_id UUID NOT NULL, - action_id UUID NOT NULL, - PRIMARY KEY (edpuser_id, action_id), - FOREIGN KEY (edpuser_id) REFERENCES edpuser (id), - FOREIGN KEY (action_id) REFERENCES action (id) -); - -CREATE TABLE IF NOT EXISTS edpuser_subscription_form ( - edpuser_id UUID NOT NULL, - form_id UUID NOT NULL, - PRIMARY KEY (edpuser_id, form_id), - FOREIGN KEY (edpuser_id) REFERENCES edpuser (id), - FOREIGN KEY (form_id) REFERENCES form (id) -); - -CREATE TABLE IF NOT EXISTS edpuser_subscription_service ( - edpuser_id UUID NOT NULL, - service_id UUID NOT NULL, - PRIMARY KEY (edpuser_id, service_id), - FOREIGN KEY (edpuser_id) REFERENCES edpuser (id), - FOREIGN KEY (service_id) REFERENCES service (id) -); - -CREATE TABLE IF NOT EXISTS edpuser_subscription_submission ( - edpuser_id UUID NOT NULL, - submission_id UUID NOT NULL, - PRIMARY KEY (edpuser_id, submission_id), - FOREIGN KEY (edpuser_id) REFERENCES edpuser (id), - FOREIGN KEY (submission_id) REFERENCES submission (id) -); - -CREATE TABLE IF NOT EXISTS edpuser_subscription_workflow ( - edpuser_id UUID NOT NULL, - workflow_id UUID NOT NULL, - PRIMARY KEY (edpuser_id, workflow_id), - FOREIGN KEY (edpuser_id) REFERENCES edpuser(id), - FOREIGN KEY (workflow_id) REFERENCES workflow (id) -); - -CREATE TABLE IF NOT EXISTS edpgroup_subscription_action ( - edpgroup_id UUID NOT NULL, - action_id UUID NOT NULL, - PRIMARY KEY (edpgroup_id, action_id), - FOREIGN KEY (edpgroup_id) REFERENCES edpgroup (id), - FOREIGN KEY (action_id) REFERENCES action (id) -); - -CREATE TABLE IF NOT EXISTS edpgroup_subscription_daac ( - edpgroup_id UUID NOT NULL, - daac_id UUID NOT NULL, - PRIMARY KEY (edpgroup_id, daac_id), - FOREIGN KEY (edpgroup_id) REFERENCES edpgroup (id), - FOREIGN KEY (daac_id) REFERENCES daac (id) -); - -CREATE TABLE IF NOT EXISTS edpgroup_subscription_form ( - edpgroup_id UUID NOT NULL, - form_id UUID NOT NULL, - PRIMARY KEY (edpgroup_id, form_id), - FOREIGN KEY (edpgroup_id) REFERENCES edpgroup (id), - FOREIGN KEY (form_id) REFERENCES form (id) -); - -CREATE TABLE IF NOT EXISTS edpgroup_subscription_service ( - edpgroup_id UUID NOT NULL, - service_id UUID NOT NULL, - PRIMARY KEY (edpgroup_id, service_id), - FOREIGN KEY (edpgroup_id) REFERENCES edpgroup (id), - FOREIGN KEY (service_id) REFERENCES service (id) -); - -CREATE TABLE IF NOT EXISTS edpgroup_subscription_submission ( - edpgroup_id UUID NOT NULL, - submission_id UUID NOT NULL, - PRIMARY KEY (edpgroup_id, submission_id), - FOREIGN KEY (submission_id) REFERENCES submission (id) -); - -CREATE TABLE IF NOT EXISTS edpgroup_subscription_workflow ( - edpgroup_id UUID NOT NULL, - workflow_id UUID NOT NULL, - PRIMARY KEY (edpgroup_id, workflow_id), - FOREIGN KEY (workflow_id) REFERENCES workflow (id) -); - CREATE TABLE IF NOT EXISTS metrics ( id UUID DEFAULT UUID_GENERATE_V4(), event JSONB NOT NULL, diff --git a/src/postgres/8-localseed.sql b/src/postgres/8-localseed.sql index a0d99dbb..e69de29b 100755 --- a/src/postgres/8-localseed.sql +++ b/src/postgres/8-localseed.sql @@ -1 +0,0 @@ -INSERT INTO module(short_name, long_name, description, arn, has_interface) VALUES ('test', 'Test Module', 'This is a test module.', 'none', True); diff --git a/src/postgres/9-updates.sql b/src/postgres/9-updates.sql index 3c25e00a..bb386597 100644 --- a/src/postgres/9-updates.sql +++ b/src/postgres/9-updates.sql @@ -177,4 +177,37 @@ WHERE id = '4ecc885f-daf8-4bc6-a8cd-d30c2a54d740'; UPDATE upload_step SET help_text = 'Please provide a cost model file. Files cannot include .exe or .dll extensions.' -WHERE step_name = 'cost_model' AND upload_destination = 'DAR_Uploads' AND category_type = 'cost_model'; \ No newline at end of file +WHERE step_name = 'cost_model' AND upload_destination = 'DAR_Uploads' AND category_type = 'cost_model'; + +-- EDPUB-1624: Remove unused db tables +DROP TABLE IF EXISTS edpgroup_parent; + +DROP TABLE IF EXISTS edpgroup_permission_submission; + +DROP TABLE IF EXISTS edpgroup_subscription_action; + +DROP TABLE IF EXISTS edpgroup_subscription_daac; + +DROP TABLE IF EXISTS edpgroup_subscription_form; + +DROP TABLE IF EXISTS edpgroup_subscription_service; + +DROP TABLE IF EXISTS edpgroup_subscription_submission; + +DROP TABLE IF EXISTS edpgroup_subscription_workflow; + +DROP TABLE IF EXISTS edpuser_permission_submission; + +DROP TABLE IF EXISTS edpuser_subscription_action; + +DROP TABLE IF EXISTS edpuser_subscription_form; + +DROP TABLE IF EXISTS edpuser_subscription_service; + +DROP TABLE IF EXISTS edpuser_subscription_submission; + +DROP TABLE IF EXISTS edpuser_subscription_workflow; + +DROP TABLE IF EXISTS module; + +DROP TABLE IF EXISTS submission_lock;