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

Conform Base DB Schema to new model #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Conform Base DB Schema to new model #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a28a6cf
Change repo information
sperrys Jul 24, 2021
9760826
Edit initial DB tables to conform to new schema
sperrys Aug 28, 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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Deliver simple court data via JSON or SMS.",
"repository": {
"type": "git",
"url": "git://github.com/codeforanchorage/courtbot.git"
"url": "git://github.com/https://github.com/CodeForAsheville/courtbot.git"
},
"main": "web.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion utils/db/db_connections.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = {
},
pool: {
afterCreate: function(connection, callback) {
connection.query(`SET TIME ZONE '${process.env.TZ}';`, function(err) {
connection.query(`SET TIME ZONE UTC;`, function(err) {
callback(err, connection);
});
}
Expand Down
129 changes: 63 additions & 66 deletions utils/db/manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,82 +21,80 @@ require('pg').types.setTypeParser(TIMESTAMPTZ_OID, date => moment(date).tz(proce
* @type {Object}
*/
const createTableInstructions = {
hearings() {
return knex.schema.hasTable('hearings')
defendants() {
return knex.schema.hasTable('defendants')
.then((exists) => {
if (!exists) {
return knex.schema.createTable('hearings', (table) => {
table.string('defendant', 100);
table.timestamp('date');
table.string('room', 100);
table.string('case_id', 100);
table.string('type', 100);
table.primary(['case_id', 'date']);
table.index('case_id');
return knex.schema.createTable('defendants', (table) => {
table.uuid("id")
.primary()
.defaultTo(knex.raw('uuid_generate_v4()'));
table.string('first_name', 100);
table.string('middle_name', 100);
table.string('last_name', 100);
table.string('suffix', 100);
table.date('birth_date')
})
}
})
},
requests() {
return knex.schema.hasTable('requests')
cases() {
return knex.schema.hasTable('cases')
.then((exists) => {
if (!exists) {
return knex.schema.createTable('requests', (table) => {
table.timestamps(true, true);
table.string('case_id', 100);
table.string('phone', 100);
table.boolean('known_case').defaultTo(false);
table.boolean('active').defaultTo(true);
table.primary(['case_id', 'phone']);
});
}
})
},
notifications() {
return knex.schema.hasTable('notifications')
.then((exists) => {
if (!exists) {
return knex.schema.createTable('notifications', (table) => {
table.timestamp('created_at').defaultTo(knex.fn.now());
table.string('case_id');
table.string('phone');
table.timestamp('event_date');
table.enu('type', ['reminder', 'matched', 'expired']);
table.string('error');
table.foreign(['case_id', 'phone']).onDelete('CASCADE').references(['case_id', 'phone' ]).inTable('requests')
return knex.schema.createTable('cases', (table) => {
table.uuid("id")
.primary()
.defaultTo(knex.raw('uuid_generate_v4()'));
table.string('case_number', 100).notNullable();
table.timestamp('court_date');
table.enu('court_type', ['district', 'superior'])
table.enu('session_type', ['AM', 'PM'])
table.string('room', 100);
// Each Case should be associated with a single defendant
table.uuid('defendant_id').notNullable()
table.foreign('defendant_id')
.references('id').inTable('defendants').onDelete('CASCADE')
})
}
})
},
log_runners() {
return knex.schema.hasTable('log_runners')
.then((exists) => {
if (!exists) {
return knex.schema.createTable('log_runners', function (table) {
table.increments()
table.enu('runner', ['send_reminder', 'send_expired', 'send_matched','load'])
table.integer('count')
table.integer('error_count')
table.timestamp('date').defaultTo(knex.fn.now())
})
}
})
subscribers() {
return knex.schema.hasTable('subscribers')
.then((exists) => {
if (!exists) {
return knex.schema.createTable('subscribers', (table) => {
table.uuid("id")
.primary()
.defaultTo(knex.raw('uuid_generate_v4()'));
table.string("phone_number", 10).notNullable()
table.date("next_notification_date")
// No two subscribers can have the same phone_number
table.unique('phone_number')
})
}
})
},
log_hits() {
return knex.schema.hasTable('log_hits')
.then((exists) => {
if (!exists) {
return knex.schema.createTable('log_hits', function (table) {
table.timestamp('time').defaultTo(knex.fn.now()),
table.string('path'),
table.string('method'),
table.string('status_code'),
table.string('phone'),
table.string('body'),
table.string('action')
})
}
})
subscriptions() {
return knex.schema.hasTable('subscriptions')
.then((exists) => {
if (!exists) {
return knex.schema.createTable('subscriptions', (table) => {
table.uuid("id")
.primary()
.defaultTo(knex.raw('uuid_generate_v4()'));
// Each Subscription should be associated with a single Defendant
// and a single Subscriber
table.uuid('defendant_id').notNullable()
table.foreign('defendant_id')
.references('id').inTable('defendants').onDelete('CASCADE')
table.uuid('subscriber_id').notNullable()
table.foreign('subscriber_id')
.references('id').inTable('subscribers').onDelete('CASCADE')
table.timestamp('subscription_date').defaultTo(knex.fn.now());
})
}
})
}
};

Expand Down Expand Up @@ -175,13 +173,12 @@ function dropTable(table) {
* Ensure all necessary tables exist.
*
* Note: create logic only creates if a table does not exists, so it is enough to just
* call createTable() for each table. Becuase of foreign key constraint, requests table must
* exist before creating notifications table. The order is important because of constraints.
* call createTable() for each table. The order is important because of constraints.
*
* @return {Promise} Promise to ensure all courtbot tables exist.
*/
function ensureTablesExist() {
const tables = ['requests', 'hearings', 'notifications', 'log_runners', 'log_hits']
const tables = ['defendants', 'cases', 'subscribers', 'subscriptions']
return tables.reduce((p, v) => p.then(() => {
return createTable(v)
.catch(err => logger.error(err))
Expand Down