Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .env.local
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
MES_DB_HOST_NAME=localhost
MES_DB_NAME=results
MES_DB_USERNAME=results_user
MES_DB_PASSWORD=Pa55word1
TESTING_MODE=true
IS_OFFLINE=true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ artefacts
.nyc_output/
.idea/
tslint-to-eslint-config.log
.env.local
5 changes: 4 additions & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.9'
services:
des-result-service-result-db:
platform: linux/x86_64
image: mysql:5.7
image: mysql:8.1
environment:
MYSQL_DATABASE: results
MYSQL_ALLOW_EMPTY_PASSWORD: 'true'
Expand All @@ -11,6 +11,9 @@ services:
volumes:
- './results_database/010-database_creation.sql:/docker-entrypoint-initdb.d/010-database_creation.sql'
- './results_database/020-test_results_table_test-data.sql:/docker-entrypoint-initdb.d/020-test_results_table_test-data.sql'
- './results_database/021-test_results_table_test-data_missing_certificates.sql:/docker-entrypoint-initdb.d/021-test_results_table_test-data_missing_certificates.sql'
- './results_database/022-test_results_table_test-data_spoiled.sql:/docker-entrypoint-initdb.d/022-test_results_table_test-data_spoiled.sql'
- './results_database/023-upload_queue_table_test_data.sql:/docker-entrypoint-initdb.d/023-upload_queue_table_test_data.sql'
- './results_database/030_audit_email_regen_test_date.sql:/docker-entrypoint-initdb.d/030_audit_email_regen_test_date.sql'
ports:
- '3306:3306'
38 changes: 35 additions & 3 deletions docker/results_database/010-database_creation.sql
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ CREATE TABLE TEST_RESULT
driver_surname varchar(50) not null,
result_status tinyint not null,
autosave bit not null,
activity_code varchar(2) null,
activity_code varchar(2) null,
category varchar(10) null,
pass_certificate_number varchar(8) null,
pass_certificate_number varchar(8) null,
version varchar(20) null,
app_version varchar(10) null,
primary key (application_reference, staff_number),
Expand Down Expand Up @@ -100,8 +100,40 @@ CREATE TABLE AUDIT_EMAIL_REGEN
regenerated_date TIMESTAMP NOT NULL,
previous_email VARCHAR(200) NULL,
new_email VARCHAR(200) NOT NULL,
previous_language VARCHAR(10) NULL,
previous_language VARCHAR(10) NULL,
new_language VARCHAR(10) NOT NULL,
user_name VARCHAR(200) NOT NULL,
ticket_ref VARCHAR(32) NOT NULL
);

CREATE TABLE DUPLICATE_CERTIFICATES
(
pass_certificate_number varchar(8) NOT NULL,
times_cert_used BIGINT NOT NULL,
test_details json NOT NULL,
PRIMARY KEY (pass_certificate_number)
);

CREATE TABLE SPOILED_CERTIFICATES_STATUS
(
id TINYINT PRIMARY KEY,
spoiled_status_name VARCHAR(7)
);

INSERT INTO SPOILED_CERTIFICATES_STATUS(id, spoiled_status_name)
VALUES (0, 'MISSING'),
(1, 'SPOILED'),
(2, 'OTHER');

CREATE TABLE SPOILED_CERTIFICATES
(
pass_certificate_number varchar(8) NOT NULL,
staff_number varchar(10) NOT NULL,
spoiled_date date NOT NULL,
tc_id bigint NOT NULL,
status tinyint NOT NULL,
reason VARCHAR(1000) NULL,
PRIMARY KEY (pass_certificate_number),
constraint SPOILED_CERTIFICATES_ibfk_1
foreign key (status) references SPOILED_CERTIFICATES_STATUS (id)
);
5 changes: 4 additions & 1 deletion docker/results_database/020-test_results_table_test-data.sql

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
INSERT INTO SPOILED_CERTIFICATES(
pass_certificate_number,
staff_number,
spoiled_date,
tc_id,
status,
reason
) VALUES
('D120103','55555555','2023-10-01',1,2,'stolen')
;
16 changes: 16 additions & 0 deletions docker/results_database/023-upload_queue_table_test_data.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
INSERT INTO UPLOAD_QUEUE (
application_reference,
staff_number,
timestamp,
interface,
upload_status,
retry_count,
error_message
) VALUES
(20000000000, '11111111', '2000-07-24 11:32:07', 0, 1, 1, null)
,(20000000000, '11111111', '2000-07-24 11:32:07', 1, 1, 1, null)
,(20000000000, '11111111', '2000-07-24 11:32:07', 2, 1, 1, null)
,(20000000001, '11111111', '2023-07-24 11:32:07', 0, 1, 1, null)
,(20000000001, '11111111', '2023-07-24 11:32:07', 1, 1, 1, null)
,(20000000001, '11111111', '2023-07-24 11:32:07', 2, 1, 1, null)
;
Loading