refactor DB changes

* various simplifications and improvements
* certificate is still as is. this is a future TODO

Author: goekay

src/main/resources/db/migration/V1_1_1__ocpp16_security.sql

@@ -1,3 +1,78 @@
+ALTER TABLE charge_box
+    ADD COLUMN security_profile INT DEFAULT 0,
+    ADD COLUMN auth_password VARCHAR(500) DEFAULT NULL;
+
+CREATE TABLE IF NOT EXISTS charge_box_security_event (
+    charge_box_pk INT NOT NULL,
+    `type` VARCHAR(100) NOT NULL,
+    `timestamp` TIMESTAMP NOT NULL,
+    tech_info VARCHAR(500),
+    event_timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+
+    FOREIGN KEY (charge_box_pk) REFERENCES charge_box (charge_box_pk) ON DELETE CASCADE,
+    INDEX idx_charge_box_pk (charge_box_pk),
+    INDEX idx_type (`type`),
+    INDEX idx_timestamp (`timestamp`)
+);
+
+CREATE TABLE IF NOT EXISTS charge_box_firmware_update_job (
+    job_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+
+    firmware_location VARCHAR(1000) NOT NULL,
+    retrieve_datetime TIMESTAMP NULL DEFAULT NULL,
+    install_datetime TIMESTAMP NULL DEFAULT NULL,
+    signing_certificate MEDIUMTEXT,
+    signature MEDIUMTEXT,
+
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE TABLE IF NOT EXISTS charge_box_firmware_update_status (
+    job_id INT NOT NULL,
+    charge_box_pk INT NOT NULL,
+
+    event_status VARCHAR(100) NOT NULL,
+    event_timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+
+    FOREIGN KEY (job_id) REFERENCES charge_box_firmware_update_job (job_id) ON DELETE CASCADE,
+    FOREIGN KEY (charge_box_pk) REFERENCES charge_box (charge_box_pk) ON DELETE CASCADE,
+
+    INDEX idx_job_id (job_id),
+    INDEX idx_charge_box_pk (charge_box_pk),
+    INDEX idx_event_status (event_status),
+    INDEX idx_event_timestamp (event_timestamp)
+);
+
+CREATE TABLE IF NOT EXISTS charge_box_log_upload_job (
+    job_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+
+    log_type VARCHAR(100) NOT NULL,
+    remote_location VARCHAR(1000),
+    oldest_timestamp TIMESTAMP NULL DEFAULT NULL,
+    latest_timestamp TIMESTAMP NULL DEFAULT NULL,
+
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE TABLE IF NOT EXISTS charge_box_log_upload_status (
+    job_id INT NOT NULL,
+    charge_box_pk INT NOT NULL,
+
+    event_status VARCHAR(100) NOT NULL,
+    event_timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+
+    FOREIGN KEY (job_id) REFERENCES charge_box_log_upload_job (job_id) ON DELETE CASCADE,
+    FOREIGN KEY (charge_box_pk) REFERENCES charge_box (charge_box_pk) ON DELETE CASCADE,
+
+    INDEX idx_job_id (job_id),
+    INDEX idx_charge_box_pk (charge_box_pk),
+    INDEX idx_event_status (event_status),
+    INDEX idx_event_timestamp (event_timestamp)
+);
+
+--
+-- TODO: This table will be reviewed later.
+--
 CREATE TABLE IF NOT EXISTS certificate (
     certificate_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
     charge_box_pk INT,
@@ -18,63 +93,3 @@ CREATE TABLE IF NOT EXISTS certificate (
     INDEX idx_status (status),
     INDEX idx_serial_number (serial_number)
 );
-
-CREATE TABLE IF NOT EXISTS security_event (
-    event_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    charge_box_pk INT NOT NULL,
-    event_type VARCHAR(100) NOT NULL,
-    event_timestamp TIMESTAMP NOT NULL,
-    tech_info MEDIUMTEXT,
-    severity VARCHAR(20) NOT NULL,
-    received_timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    CONSTRAINT FK_security_event_charge_box FOREIGN KEY (charge_box_pk) REFERENCES charge_box (charge_box_pk) ON DELETE CASCADE,
-    INDEX idx_charge_box_pk (charge_box_pk),
-    INDEX idx_event_type (event_type),
-    INDEX idx_event_timestamp (event_timestamp),
-    INDEX idx_severity (severity)
-);
-
-CREATE TABLE IF NOT EXISTS log_file (
-    log_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    charge_box_pk INT NOT NULL,
-    log_type VARCHAR(50) NOT NULL,
-    request_id INT NOT NULL,
-    request_timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    file_path VARCHAR(1000),
-    upload_status VARCHAR(50) DEFAULT 'Pending',
-    upload_timestamp TIMESTAMP NULL DEFAULT NULL,
-    bytes_uploaded BIGINT,
-    CONSTRAINT FK_log_file_charge_box FOREIGN KEY (charge_box_pk) REFERENCES charge_box (charge_box_pk) ON DELETE CASCADE,
-    INDEX idx_charge_box_pk (charge_box_pk),
-    INDEX idx_log_type (log_type),
-    INDEX idx_request_id (request_id),
-    INDEX idx_upload_status (upload_status)
-);
-
-CREATE TABLE IF NOT EXISTS firmware_update (
-    update_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    charge_box_pk INT NOT NULL,
-    firmware_location VARCHAR(1000) NOT NULL,
-    firmware_signature MEDIUMTEXT,
-    retrieve_date TIMESTAMP NULL DEFAULT NULL,
-    install_date TIMESTAMP NULL DEFAULT NULL,
-    signing_certificate MEDIUMTEXT,
-    signature_algorithm VARCHAR(100),
-    request_timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    status VARCHAR(50) DEFAULT 'Pending',
-    CONSTRAINT FK_firmware_update_charge_box FOREIGN KEY (charge_box_pk) REFERENCES charge_box (charge_box_pk) ON DELETE CASCADE,
-    INDEX idx_charge_box_pk (charge_box_pk),
-    INDEX idx_status (status),
-    INDEX idx_retrieve_date (retrieve_date)
-);
-
-ALTER TABLE charge_box ADD COLUMN security_profile INT DEFAULT 0;
-ALTER TABLE charge_box ADD COLUMN authorization_key VARCHAR(100);
-ALTER TABLE charge_box ADD COLUMN cpo_name VARCHAR(255);
-ALTER TABLE charge_box ADD COLUMN certificate_store_max_length INT DEFAULT 0;
-ALTER TABLE charge_box ADD COLUMN additional_root_certificate_check BOOLEAN DEFAULT FALSE;
-ALTER TABLE charge_box
-  ADD COLUMN auth_password VARCHAR(255) DEFAULT NULL
-  COMMENT 'BCrypt hashed password for Basic Authentication';
-
-CREATE INDEX idx_charge_box_auth ON charge_box(charge_box_id, auth_password);