Merge pull request 'Fixed annoying bullshit' (#184) from devcontainers into main

Reviewed-on: #184

api/migrations/20260204025935-remove-unused-tables.js

@@ -0,0 +1,53 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+var fs = require('fs');
+var path = require('path');
+var Promise;
+
+/**
+  * We receive the dbmigrate dependency from dbmigrate initially.
+  * This enables us to not have to rely on NODE_PATH.
+  */
+exports.setup = function(options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+  Promise = options.Promise;
+};
+
+exports.up = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20260204025935-remove-unused-tables-up.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports.down = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20260204025935-remove-unused-tables-down.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports._meta = {
+  "version": 1
+};

api/migrations/sqls/20260201154439-initial-up.sql

@@ -473,55 +473,6 @@ CREATE TABLE IF NOT EXISTS `members_unit` (
   CONSTRAINT `FK_members_unit_units` FOREIGN KEY (`unit_id`) REFERENCES `units` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
-CREATE TABLE IF NOT EXISTS `mission_attendee_roles` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) DEFAULT NULL,
-  `short_name` varchar(50) DEFAULT NULL,
-  `description` text DEFAULT NULL,
-  `deleted` tinyint(1) NOT NULL DEFAULT 0,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `role_name` (`name`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE IF NOT EXISTS `mission_event_attendees` (
-  `id` int(11) DEFAULT NULL,
-  `member_id` int(11) NOT NULL,
-  `event_id` int(11) NOT NULL,
-  `member_role_id` int(11) DEFAULT NULL,
-  `event_type` int(11) NOT NULL,
-  `created_at` datetime NOT NULL DEFAULT current_timestamp(),
-  `updated_at` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  PRIMARY KEY (`member_id`,`event_id`) USING BTREE,
-  KEY `fk_mission_event_attendees_role_id` (`member_role_id`),
-  KEY `fk_mission_event_events_id` (`event_id`),
-  CONSTRAINT `fk_member_event_member_id` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `fk_mission_event_attendees_role_id` FOREIGN KEY (`member_role_id`) REFERENCES `mission_attendee_roles` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `fk_mission_event_events_id` FOREIGN KEY (`event_id`) REFERENCES `mission_events` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE IF NOT EXISTS `mission_events` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `event_type_id` int(11) NOT NULL,
-  `event_name` varchar(100) NOT NULL,
-  `description` varchar(100) DEFAULT NULL,
-  `mission_name` varchar(100) NOT NULL,
-  `author_id` int(11) DEFAULT NULL,
-  `map_id` int(11) DEFAULT NULL,
-  `event_date` datetime NOT NULL,
-  `guilded_event_id` int(11) DEFAULT NULL,
-  `created_at` datetime NOT NULL DEFAULT current_timestamp(),
-  `updated_at` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `deleted` tinyint(1) DEFAULT 0,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `event_name` (`event_name`),
-  KEY `fk_events_author_member_id` (`author_id`) USING BTREE,
-  KEY `fk_mission_event_type_id` (`event_type_id`),
-  KEY `fk_mission_event_map_id` (`map_id`),
-  CONSTRAINT `fk_events_author_id` FOREIGN KEY (`author_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `fk_mission_event_map_id` FOREIGN KEY (`map_id`) REFERENCES `arma_maps` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `fk_mission_event_type_id` FOREIGN KEY (`event_type_id`) REFERENCES `event_types` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
 CREATE TABLE IF NOT EXISTS `operation_campaigns` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
@@ -692,7 +643,7 @@ CREATE TABLE IF NOT EXISTS `site_config` (
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 
-CREATE PROCEDURE `sp_accept_new_recruit_validation`(
+CREATE PROCEDURE IF NOT EXISTS `sp_accept_new_recruit_validation`(
 	IN `p_site_config_id` INT,
 	IN `p_member_id` INT,
 	IN `p_authorized_by_id` INT,
@@ -864,7 +815,7 @@ BEGIN
 END;
 
 
-CREATE PROCEDURE `sp_end_member_rank`(
+CREATE PROCEDURE IF NOT EXISTS `sp_end_member_rank`(
 	IN `p_member_id` INT,
 	IN `p_end_date` DATETIME
 )
@@ -889,7 +840,7 @@ BEGIN
 END;
 
 
-CREATE PROCEDURE `sp_end_member_status`(
+CREATE PROCEDURE IF NOT EXISTS `sp_end_member_status`(
 	IN `p_member_id` INT,
 	IN `p_end_date` DATETIME
 )
@@ -914,7 +865,7 @@ BEGIN
 END;
 
 
-CREATE PROCEDURE `sp_end_member_unit`(
+CREATE PROCEDURE IF NOT EXISTS `sp_end_member_unit`(
 	IN `p_member_id` INT,
 	IN `p_end_date` DATETIME
 )
@@ -939,7 +890,7 @@ BEGIN
 END;
 
 
-CREATE PROCEDURE `sp_GetCalendarEventSignups`(
+CREATE PROCEDURE IF NOT EXISTS `sp_GetCalendarEventSignups`(
 	IN `p_event_id` INT
 )
 BEGIN
@@ -973,7 +924,7 @@ BEGIN
 END;
 
 
-CREATE PROCEDURE `sp_manual_update_report`(
+CREATE PROCEDURE IF NOT EXISTS `sp_manual_update_report`(
 	IN `p_member_guilded_id_createdBy` VARCHAR(10),
 	IN `p_guilded_report_id` VARCHAR(50)
 )
@@ -1006,8 +957,8 @@ BEGIN
       AND ce.deleted = 0;
 END;
 
-
-CREATE PROCEDURE `sp_update_member_rank`(
+DROP PROCEDURE IF EXISTS `sp_update_member_rank`;
+CREATE PROCEDURE IF NOT EXISTS `sp_update_member_rank`(
 	IN `p_member_id` INT,
 	IN `p_rank_id` INT,
 	IN `p_authorized_by_id` INT,
@@ -1075,7 +1026,7 @@ sp: BEGIN
 END;
 
 
-CREATE PROCEDURE `sp_update_member_rank_Backup_1-27-2026`(
+CREATE PROCEDURE IF NOT EXISTS `sp_update_member_rank_Backup_1-27-2026`(
 	IN `p_member_id` INT,
 	IN `p_rank_id` INT,
 	IN `p_authorized_by_id` INT,
@@ -1110,8 +1061,8 @@ BEGIN
     END IF;
 END;
 
-
-CREATE PROCEDURE `sp_update_member_status`(
+DROP PROCEDURE IF EXISTS `sp_update_member_status`;
+CREATE PROCEDURE IF NOT EXISTS `sp_update_member_status`(
 	IN `p_member_id` INT,
 	IN `p_status_id` INT,
 	IN `p_authorized_by_id` INT,
@@ -1179,7 +1130,7 @@ sp: BEGIN
 END;
 
 
-CREATE PROCEDURE `sp_update_member_status_Backup_1-27-2026`(
+CREATE PROCEDURE IF NOT EXISTS `sp_update_member_status_Backup_1-27-2026`(
 	IN `p_member_id` INT,
 	IN `p_status_id` INT,
 	IN `p_authorized_by_id` INT,
@@ -1214,8 +1165,8 @@ BEGIN
     END IF;
 END;
 
-
-CREATE PROCEDURE `sp_update_member_unit`(
+DROP PROCEDURE IF EXISTS `sp_update_member_unit`;
+CREATE PROCEDURE IF NOT EXISTS `sp_update_member_unit`(
 	IN `p_member_id` INT,
 	IN `p_unit_id` INT,
 	IN `p_authorized_by_id` INT,
@@ -1282,7 +1233,7 @@ sp: BEGIN
 END;
 
 
-CREATE PROCEDURE `sp_update_member_unit_Backup_1-27-2026`(
+CREATE PROCEDURE IF NOT EXISTS `sp_update_member_unit_Backup_1-27-2026`(
 	IN `p_member_id` INT,
 	IN `p_unit_id` INT,
 	IN `p_authorized_by_id` INT,
@@ -1374,34 +1325,10 @@ CREATE TABLE IF NOT EXISTS `units` (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4;
 
-CREATE TABLE `view_member_rank_unit_status_latest` (
-	`member_id` INT(11) NOT NULL,
-	`member_name` VARCHAR(1) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`displayName` VARCHAR(1) NULL COLLATE 'utf8mb4_general_ci',
-	`member_state` ENUM('guest','applicant','member','retired','banned','denied') NOT NULL COLLATE 'utf8mb4_general_ci',
-	`rank_id` INT(11) NULL,
-	`rank` LONGTEXT NULL COLLATE 'utf8mb4_general_ci',
-	`rank_abv` VARCHAR(1) NULL COLLATE 'utf8mb4_general_ci',
-	`rank_date` DATE NULL,
-	`unit_id` INT(11) NULL,
-	`unit` VARCHAR(1) NULL COLLATE 'utf8mb4_general_ci',
-	`unit_date` DATE NULL,
-	`status` VARCHAR(1) NULL COLLATE 'utf8mb4_general_ci',
-	`status_date` DATE NULL,
-	`loa_until` DATE NULL
-);
-
-CREATE TABLE `view_member_settings` (
-	`id` INT(11) NOT NULL,
-	`displayName` VARCHAR(1) NULL COLLATE 'utf8mb4_general_ci'
-);
-
-DROP TABLE IF EXISTS `view_member_rank_unit_status_latest`;
-CREATE ALGORITHM=UNDEFINED VIEW `view_member_rank_unit_status_latest` AS select `m`.`id` AS `member_id`,`m`.`name` AS `member_name`,`m`.`displayName` AS `displayName`,`m`.`state` AS `member_state`,`r`.`id` AS `rank_id`,`r`.`name` AS `rank`,`r`.`short_name` AS `rank_abv`,`mr`.`start_date` AS `rank_date`,`u`.`id` AS `unit_id`,`u`.`name` AS `unit`,`mu`.`start_date` AS `unit_date`,`s`.`name` AS `status`,`ms`.`start_date` AS `status_date`,`loa`.`loa_until` AS `loa_until` from (((((((`members` `m` left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`rank_id` AS `rank_id`,`x`.`authorized_by_id` AS `authorized_by_id`,`x`.`created_by_id` AS `created_by_id`,`x`.`reason` AS `reason`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at`,`x`.`batch` AS `batch` from (`members_ranks` `x` join (select `members_ranks`.`member_id` AS `member_id`,max(`members_ranks`.`created_at`) AS `max_created` from `members_ranks` where `members_ranks`.`end_date` is null group by `members_ranks`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `mr` on(`mr`.`member_id` = `m`.`id`)) left join `ranks` `r` on(`r`.`id` = `mr`.`rank_id`)) left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`unit_id` AS `unit_id`,`x`.`authorized_by_id` AS `authorized_by_id`,`x`.`created_by_id` AS `created_by_id`,`x`.`reason` AS `reason`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at` from (`members_unit` `x` join (select `members_unit`.`member_id` AS `member_id`,max(`members_unit`.`created_at`) AS `max_created` from `members_unit` where `members_unit`.`end_date` is null group by `members_unit`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `mu` on(`mu`.`member_id` = `m`.`id`)) left join `units` `u` on(`u`.`id` = `mu`.`unit_id`)) left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`status_id` AS `status_id`,`x`.`authorized_by_id` AS `authorized_by_id`,`x`.`created_by_id` AS `created_by_id`,`x`.`reason` AS `reason`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at` from (`members_statuses` `x` join (select `members_statuses`.`member_id` AS `member_id`,max(`members_statuses`.`created_at`) AS `max_created` from `members_statuses` where `members_statuses`.`end_date` is null group by `members_statuses`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `ms` on(`ms`.`member_id` = `m`.`id`)) left join `statuses` `s` on(`s`.`id` = `ms`.`status_id`)) left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`filed_date` AS `filed_date`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`extended_till` AS `extended_till`,`x`.`type_id` AS `type_id`,`x`.`reason` AS `reason`,`x`.`created_by_id` AS `created_by_id`,`x`.`deleted` AS `deleted`,`x`.`expired` AS `expired`,`x`.`closed_by` AS `closed_by`,`x`.`ended_at` AS `ended_at`,`x`.`closed` AS `closed`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at`,greatest(cast(`x`.`end_date` as date),cast(coalesce(`x`.`extended_till`,`x`.`end_date`) as date)) AS `loa_until` from (`leave_of_absences` `x` join (select `leave_of_absences`.`member_id` AS `member_id`,max(`leave_of_absences`.`created_at`) AS `max_created` from `leave_of_absences` where (`leave_of_absences`.`deleted` = 0 or `leave_of_absences`.`deleted` is null) and (`leave_of_absences`.`closed` = 0 or `leave_of_absences`.`closed` is null) group by `leave_of_absences`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `loa` on(`loa`.`member_id` = `m`.`id`)) order by `m`.`displayName`
+CREATE OR REPLACE VIEW `view_member_rank_unit_status_latest` AS select `m`.`id` AS `member_id`,`m`.`name` AS `member_name`,`m`.`displayName` AS `displayName`,`m`.`state` AS `member_state`,`r`.`id` AS `rank_id`,`r`.`name` AS `rank`,`r`.`short_name` AS `rank_abv`,`mr`.`start_date` AS `rank_date`,`u`.`id` AS `unit_id`,`u`.`name` AS `unit`,`mu`.`start_date` AS `unit_date`,`s`.`name` AS `status`,`ms`.`start_date` AS `status_date`,`loa`.`loa_until` AS `loa_until` from (((((((`members` `m` left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`rank_id` AS `rank_id`,`x`.`authorized_by_id` AS `authorized_by_id`,`x`.`created_by_id` AS `created_by_id`,`x`.`reason` AS `reason`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at`,`x`.`batch` AS `batch` from (`members_ranks` `x` join (select `members_ranks`.`member_id` AS `member_id`,max(`members_ranks`.`created_at`) AS `max_created` from `members_ranks` where `members_ranks`.`end_date` is null group by `members_ranks`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `mr` on(`mr`.`member_id` = `m`.`id`)) left join `ranks` `r` on(`r`.`id` = `mr`.`rank_id`)) left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`unit_id` AS `unit_id`,`x`.`authorized_by_id` AS `authorized_by_id`,`x`.`created_by_id` AS `created_by_id`,`x`.`reason` AS `reason`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at` from (`members_unit` `x` join (select `members_unit`.`member_id` AS `member_id`,max(`members_unit`.`created_at`) AS `max_created` from `members_unit` where `members_unit`.`end_date` is null group by `members_unit`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `mu` on(`mu`.`member_id` = `m`.`id`)) left join `units` `u` on(`u`.`id` = `mu`.`unit_id`)) left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`status_id` AS `status_id`,`x`.`authorized_by_id` AS `authorized_by_id`,`x`.`created_by_id` AS `created_by_id`,`x`.`reason` AS `reason`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at` from (`members_statuses` `x` join (select `members_statuses`.`member_id` AS `member_id`,max(`members_statuses`.`created_at`) AS `max_created` from `members_statuses` where `members_statuses`.`end_date` is null group by `members_statuses`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `ms` on(`ms`.`member_id` = `m`.`id`)) left join `statuses` `s` on(`s`.`id` = `ms`.`status_id`)) left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`filed_date` AS `filed_date`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`extended_till` AS `extended_till`,`x`.`type_id` AS `type_id`,`x`.`reason` AS `reason`,`x`.`created_by_id` AS `created_by_id`,`x`.`deleted` AS `deleted`,`x`.`expired` AS `expired`,`x`.`closed_by` AS `closed_by`,`x`.`ended_at` AS `ended_at`,`x`.`closed` AS `closed`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at`,greatest(cast(`x`.`end_date` as date),cast(coalesce(`x`.`extended_till`,`x`.`end_date`) as date)) AS `loa_until` from (`leave_of_absences` `x` join (select `leave_of_absences`.`member_id` AS `member_id`,max(`leave_of_absences`.`created_at`) AS `max_created` from `leave_of_absences` where (`leave_of_absences`.`deleted` = 0 or `leave_of_absences`.`deleted` is null) and (`leave_of_absences`.`closed` = 0 or `leave_of_absences`.`closed` is null) group by `leave_of_absences`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `loa` on(`loa`.`member_id` = `m`.`id`)) order by `m`.`displayName`
 ;
 
-DROP TABLE IF EXISTS `view_member_settings`;
-CREATE ALGORITHM=UNDEFINED VIEW `view_member_settings` AS select `m`.`id` AS `id`,`m`.`displayName` AS `displayName` from `members` `m`
+CREATE OR REPLACE VIEW `view_member_settings` AS select `m`.`id` AS `id`,`m`.`displayName` AS `displayName` from `members` `m`
 ;
 
 /*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */;

api/migrations/sqls/20260204025935-remove-unused-tables-down.sql

@@ -0,0 +1 @@
+/* Replace with your SQL commands */

api/migrations/sqls/20260204025935-remove-unused-tables-up.sql

@@ -0,0 +1,5 @@
+/* Replace with your SQL commands */
+
+DROP PROCEDURE `sp_update_member_rank_Backup_1-27-2026`;
+DROP PROCEDURE `sp_update_member_status_Backup_1-27-2026`;
+DROP PROCEDURE `sp_update_member_unit_Backup_1-27-2026`;