Skip to content

Removing unused database tables and references to them #332

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

Merged
camposeddie merged 1 commit into from
Jan 22, 2026
Merged

Removing unused database tables and references to them #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
196 changes: 3 additions & 193 deletions src/nodejs/lambda-layers/database-util/src/query/group.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
Expand All @@ -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: {
Expand All @@ -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',
Expand Down Expand Up @@ -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' }] : []),
Expand Down
7 changes: 3 additions & 4 deletions src/nodejs/lambda-layers/database-util/src/query/submission.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down
Loading