PUSH

-> Fix db structure -> Tickets message
MythicalLTD · Jan 21, 2025 · f239179 · f239179
1 parent c4a2594
commit f239179
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 69 deletions.
diff --git a/backend/app/App.php b/backend/app/App.php
@@ -13,6 +13,7 @@
 
 namespace MythicalClient;
 
+use MythicalClient\MythicalSystems\Telemetry;
 use RateLimit\Rate;
 use Router\Router as rt;
 use RateLimit\RedisRateLimiter;

diff --git a/backend/app/Logger/LoggerFactory.php b/backend/app/Logger/LoggerFactory.php
@@ -35,7 +35,6 @@ public function warning(string $message, bool $sendTelemetry = false): void
     {
         $caller = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['class'] ?? 'unknown';
         if ($sendTelemetry) {
-
             $eventID = \Sentry\captureMessage($message, \Sentry\Severity::warning(), null);
         }
         $this->appendLog('[WARNING] (' . $eventID . ')[' . $caller . '] ' . $message);

diff --git a/backend/app/MythicalSystems/Telemetry.php b/backend/app/MythicalSystems/Telemetry.php
@@ -15,42 +15,14 @@
 
 use MythicalClient\App;
 
-class Telemetry implements TelemetryCollection
+class Telemetry 
 {
-    public static function send(TelemetryCollection|string $telemetryCollection): void
+    public static function send(string $telemetryCollection): void
     {
         try {
             App::getInstance(true)->getLogger()->debug('Sending telemetry data: ' . $telemetryCollection);
-            $url = sprintf(
-                'https://api.mythicalsystems.xyz/telemetry?authKey=%s&project=%s&action=%s&osName=%s&kernelName=%s&cpuArchitecture=%s&osArchitecture=%s',
-                'AxWTnecj85SI4bG6rIP8bvw2uCF7W5MmkJcQIkrYS80MzeTraQWyICL690XOio8F',
-                'mythicalclient',
-                urlencode((string) $telemetryCollection),
-                urlencode(SYSTEM_OS_NAME),
-                urlencode(SYSTEM_KERNEL_NAME),
-                'amd',
-                '64'
-            );
 
-            $curl = curl_init();
-            curl_setopt_array($curl, [
-                CURLOPT_URL => $url,
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_ENCODING => '',
-                CURLOPT_MAXREDIRS => 10,
-                CURLOPT_TIMEOUT => 10,
-                CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-                CURLOPT_CUSTOMREQUEST => 'GET',
-                CURLOPT_POSTFIELDS => '',
-                CURLOPT_HTTPHEADER => [
-                    'Content-Type: application/json',
-                    'User-Agent: mythicalclient/' . APP_VERSION,
-                ],
-            ]);
-
-            curl_exec($curl);
-            curl_close($curl);
-        } catch (\Exception $e) {
+		} catch (\Exception $e) {
             App::getInstance(true)->getLogger()->debug('Failed to send telemetry data: ' . $e->getMessage());
             // No one cares!
         }

diff --git a/backend/app/MythicalSystems/TelemetryCollection.php b/backend/app/MythicalSystems/TelemetryCollection.php
diff --git a/backend/storage/migrations/2024-12-25-22.04-create-services-categories-features.sql b/backend/storage/migrations/2024-12-25-22.04-create-services-categories-features.sql
@@ -1,13 +1,13 @@
-CREATE TABLE IF NOT EXISTS
-    `mythicalclient_services_categories_features` (
-        `id` INT NOT NULL AUTO_INCREMENT,
-        `name` TEXT NOT NULL , 
-        `category` int(16) NOT NULL,
-        `description` TEXT NOT NULL,
-        `enabled` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
-        `deleted` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
-        `locked` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
-        `date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        PRIMARY KEY (`id`),
-        FOREIGN KEY (`category`) REFERENCES `mythicalclient_services_categories` (`id`)
-    ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
+CREATE TABLE
+	IF NOT EXISTS `mythicalclient_services_categories_features` (
+		`id` INT NOT NULL AUTO_INCREMENT,
+		`name` TEXT NOT NULL,
+		`category` int (16) NOT NULL,
+		`description` TEXT NOT NULL,
+		`enabled` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
+		`deleted` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
+		`locked` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
+		`date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+		PRIMARY KEY (`id`),
+		FOREIGN KEY (`category`) REFERENCES `mythicalclient_services_categories` (`id`)
+	) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
diff --git a/backend/storage/migrations/2025-01-14-14.19-create-announcements.sql b/backend/storage/migrations/2025-01-14-14.19-create-announcements.sql
@@ -4,6 +4,8 @@ CREATE TABLE
         `title` TEXT NOT NULL,
         `shortDescription` TEXT NOT NULL,
         `description` TEXT NOT NULL,
+		`deleted` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
+        `locked` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
         `date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
         PRIMARY KEY (`id`)
     ) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
diff --git a/backend/storage/migrations/2025-01-14-14.20-create-announcements_assets.sql b/backend/storage/migrations/2025-01-14-14.20-create-announcements_assets.sql
@@ -3,6 +3,8 @@ CREATE TABLE
         `id` INT NOT NULL AUTO_INCREMENT,
         `announcements` int(16) NOT NULL,
         `images` TEXT NOT NULL,
+		`deleted` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
+        `locked` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
         `date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
         PRIMARY KEY (`id`),
         FOREIGN KEY (`announcements`) REFERENCES `mythicalclient_announcements`(`id`)

diff --git a/backend/storage/migrations/2025-01-14-14.21-create-announcements_tags.sql b/backend/storage/migrations/2025-01-14-14.21-create-announcements_tags.sql
@@ -3,6 +3,8 @@ CREATE TABLE
         `id` INT NOT NULL AUTO_INCREMENT,
         `announcements` int(16) NOT NULL,
         `tag` TEXT NOT NULL,
+		`deleted` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
+        `locked` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
         `date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
         PRIMARY KEY (`id`),
         FOREIGN KEY (`announcements`) REFERENCES `mythicalclient_announcements`(`id`)

diff --git a/backend/storage/migrations/2025-01-21-00.16-add-ticket-prio.sql b/backend/storage/migrations/2025-01-21-00.16-add-ticket-prio.sql
@@ -1 +1 @@
-ALTER TABLE `mythicalclient_tickets` ADD `priority` ENUM('low','medium','high','urgent') NOT NULL DEFAULT 'low' AFTER `department`;
+ALTER TABLE `mythicalclient_tickets` ADD `priority` ENUM ('low', 'medium', 'high', 'urgent') NOT NULL DEFAULT 'low' AFTER `department`;
diff --git a/backend/storage/migrations/2025-01-21-12.50-add-status-tickets.sql b/backend/storage/migrations/2025-01-21-12.50-add-status-tickets.sql
@@ -1 +1,7 @@
-ALTER TABLE `mythicalclient_tickets` ADD `status` ENUM('open','closed','waiting','replied','inprogress') NOT NULL DEFAULT 'open' AFTER `priority`;
+ALTER TABLE `mythicalclient_tickets` ADD `status` ENUM (
+	'open',
+	'closed',
+	'waiting',
+	'replied',
+	'inprogress'
+) NOT NULL DEFAULT 'open' AFTER `priority`;
diff --git a/backend/storage/migrations/2025-01-21-15.04-create-ticket-message.sql b/backend/storage/migrations/2025-01-21-15.04-create-ticket-message.sql
@@ -0,0 +1,13 @@
+CREATE TABLE
+	`mythicalclient_tickets_messages` (
+		`id` INT NOT NULL AUTO_INCREMENT,
+		`ticket` INT (16) NOT NULL,
+        `user` varchar(36) NOT NULL,
+		`message` TEXT NOT NULL,
+		`deleted` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
+		`locked` ENUM ('false', 'true') NOT NULL DEFAULT 'false',
+		`date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+		PRIMARY KEY (`id`),
+		FOREIGN KEY (`ticket`) REFERENCES `mythicalclient_tickets`(`id`),
+		FOREIGN KEY (`user`) REFERENCES `mythicalclient_users`(`uuid`)
+    ) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ALTER TABLE `mythicalclient_tickets` ADD `priority` ENUM('low','medium','high','urgent') NOT NULL DEFAULT 'low' AFTER `department`;
		ALTER TABLE `mythicalclient_tickets` ADD `priority` ENUM ('low', 'medium', 'high', 'urgent') NOT NULL DEFAULT 'low' AFTER `department`;