Fixed db set date & show only changed fields in history view #246

kdb-bot/src/bot_data/migration/db_history_scripts/api_keys.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `ApiKeys`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `ApiKeys`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `ApiKeys`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `ApiKeysHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/auth_user_users_relation.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `AuthUserUsersRelations`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `AuthUserUsersRelations`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `AuthUserUsersRelations`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 
 CREATE TABLE IF NOT EXISTS `AuthUserUsersRelationsHistory`

kdb-bot/src/bot_data/migration/db_history_scripts/auth_users.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `AuthUsers`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `AuthUsers`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `AuthUsers`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `AuthUsersHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/auto_role_rules.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `AutoRoleRules`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `AutoRoleRules`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `AutoRoleRules`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `AutoRoleRulesHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/auto_roles.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `AutoRoles`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `AutoRoles`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `AutoRoles`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `AutoRolesHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/clients.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `Clients`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `Clients`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `Clients`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `ClientsHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/game_servers.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `GameServers`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `GameServers`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `GameServers`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `GameServersHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/known_users.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `KnownUsers`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `KnownUsers`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `KnownUsers`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `KnownUsersHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/levels.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `Levels`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `Levels`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `Levels`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `LevelsHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/servers.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `Servers`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `Servers`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `Servers`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `ServersHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/user_game_idents.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `UserGameIdents`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `UserGameIdents`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `UserGameIdents`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UserGameIdentsHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/user_joined_game_servers.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `UserJoinedGameServer`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `UserJoinedGameServer`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `UserJoinedGameServer`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UserJoinedGameServerHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/user_joined_servers.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `UserJoinedServers`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `UserJoinedServers`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `UserJoinedServers`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UserJoinedServersHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/user_joined_voice_channel.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `UserJoinedVoiceChannel`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `UserJoinedVoiceChannel`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `UserJoinedVoiceChannel`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UserJoinedVoiceChannelHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/user_message_count_per_hour.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `UserMessageCountPerHour`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `UserMessageCountPerHour`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `UserMessageCountPerHour`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UserMessageCountPerHourHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/user_warnings.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `UserWarnings`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `UserWarnings`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `UserWarnings`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UserWarningsHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/users.sql

@@ -1,11 +1,8 @@
-ALTER TABLE `Users`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
-
 ALTER TABLE `Users`
     CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `Users`
-    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UsersHistory`
 (

kdb-bot/src/bot_graphql/model/user.gql

@@ -30,7 +30,6 @@ type UserHistory implements HistoryTableQuery {
     xp: Int
 
     server: ID
-    leftServer: Boolean
 
     deleted: Boolean
     dateFrom: String

kdb-bot/src/bot_graphql/queries/user_history_query.py

@@ -10,7 +10,6 @@ class UserHistoryQuery(HistoryQueryABC):
         self.set_field("discordId", self.resolve_discord_id)
         self.set_field("xp", self.resolve_xp)
         self.set_field("server", self.resolve_server)
-        self.set_field("leftServer", self.resolve_left_server)
 
     @staticmethod
     def resolve_id(user: User, *_):
@@ -27,7 +26,3 @@ class UserHistoryQuery(HistoryQueryABC):
     @staticmethod
     def resolve_server(user: User, *_):
         return user.server
-
-    @staticmethod
-    def resolve_left_server(user: User, *_):
-        return user.left_server

kdb-web/package.json

@@ -50,4 +50,4 @@
         "tslib": "^2.4.1",
         "typescript": "~4.9.5"
     }
-}
+}

kdb-web/src/app/models/graphql/queries.model.ts

@@ -133,7 +133,6 @@ export class Queries {
             discordId
             xp
             server
-            leftServer
             deleted
             dateFrom
             dateTo

kdb-web/src/app/modules/shared/components/history-btn/history-btn.component.ts

@@ -20,8 +20,20 @@ export class HistoryBtnComponent implements OnInit {
   }
 
   openHistory(): void {
-    console.log("history", this.history);
     this.showSidebar = true;
+    let oldHistory: Partial<History> = {};
+    for (const history of this.history) {
+      const attributes = Object.keys(history).map((key) => {
+        return key;
+      });
+      for (const attribute of attributes) {
+        if (history[attribute] === oldHistory[attribute]) {
+          delete oldHistory[attribute];
+        }
+      }
+
+      oldHistory = history;
+    }
   }
 
   getAttributeTranslationKey(key: string) {

kdb-web/src/app/modules/shared/components/history/history.component.html

@@ -1 +0,0 @@
-<p>history works!</p>

kdb-web/src/app/modules/shared/components/history/history.component.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HistoryComponent } from './history.component';
-
-describe('HistoryComponent', () => {
-  let component: HistoryComponent;
-  let fixture: ComponentFixture<HistoryComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ HistoryComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(HistoryComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

kdb-web/src/app/modules/shared/components/history/history.component.ts

@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-history',
-  templateUrl: './history.component.html',
-  styleUrls: ['./history.component.scss']
-})
-export class HistoryComponent {
-
-}

kdb-web/src/app/modules/shared/shared.module.ts

@@ -23,7 +23,6 @@ import { PanelModule } from "primeng/panel";
 import { InputNumberModule } from "primeng/inputnumber";
 import { ImageModule } from "primeng/image";
 import { SidebarModule } from "primeng/sidebar";
-import { HistoryComponent } from "./components/history/history.component";
 import { HistoryBtnComponent } from './components/history-btn/history-btn.component';
 
 
@@ -32,7 +31,6 @@ import { HistoryBtnComponent } from './components/history-btn/history-btn.compon
     AuthRolePipe,
     IpAddressPipe,
     BoolPipe,
-    HistoryComponent,
     HistoryBtnComponent,
   ],
   imports: [

kdb-web/src/assets/config.json

@@ -23,4 +23,4 @@
             "Name": "sh-edraft-dark-theme"
         }
     ]
-}
+}

kdb-web/update-version.ts

@@ -9,7 +9,7 @@ function Main(): void {
       setVersion(version);
     })
     .catch(err => {
-      throwError(() => err);
+      throw err;
     });
 }
 
@@ -50,7 +50,7 @@ async function setVersion(version: SoftwareVersion) {
   const fs = require("fs");
   fs.readFile(jsonFilePath, "utf8", (err: Error, data: string) => {
     if (err) {
-      throwError(() => err);
+      throw err;
     }
     const settings: Appsettings = JSON.parse(data);
     settings.WebVersion = version;
@@ -59,7 +59,7 @@ async function setVersion(version: SoftwareVersion) {
   });
   fs.readFile('./package.json', "utf8", (err: Error, data: string) => {
     if (err) {
-      throwError(() => err);
+      throw err;
     }
     const settings = JSON.parse(data);
     settings.version = version.getVersionString();