db refactor

src/ORM/client/client.entity.ts

@@ -1,21 +1,24 @@
-import { Column, Entity, Index, PrimaryColumn } from 'typeorm';
+import { Column, Entity, Index, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
 
+import { ClientStatisticsEntity } from '../client-statistics/client-statistics.entity';
 import { TrackedEntity } from '../utils/TrackedEntity.entity';
 
 
 @Entity()
-@Index(['address', 'clientName', 'sessionId'], { unique: true })
+@Index("IDX_unique_nonce", { synchronize: false })
 export class ClientEntity extends TrackedEntity {
 
-
-    @PrimaryColumn({ length: 62, type: 'varchar' })
-    address: string;
-
-    @PrimaryColumn({ length: 64, type: 'varchar' })
-    clientName: string;
+    @PrimaryGeneratedColumn('uuid')
+    id: string;
 
     @Index()
-    @PrimaryColumn({ length: 8, type: 'varchar' })
+    @Column({ length: 62, type: 'varchar' })
+    address: string;
+
+    @Column({ length: 64, type: 'varchar' })
+    clientName: string;
+
+    @Column({ length: 8, type: 'varchar', })
     sessionId: string;
 
 
@@ -23,7 +26,6 @@ export class ClientEntity extends TrackedEntity {
     userAgent: string;
 
 
-
     @Column({ type: 'timestamp' })
     startTime: Date;
 
@@ -33,5 +35,11 @@ export class ClientEntity extends TrackedEntity {
     @Column({ default: 0, type: 'decimal' })
     hashRate: number;
 
+    @OneToMany(
+        () => ClientStatisticsEntity,
+        clientStatisticsEntity => clientStatisticsEntity.client
+    )
+    statistics: ClientStatisticsEntity[]
+
 }
 

src/ORM/client/client.service.ts

@@ -28,8 +28,8 @@ export class ClientService {
             .execute();
     }
 
-    public async heartbeat(address: string, clientName: string, sessionId: string, hashRate: number, updatedAt: Date) {
-        return await this.clientRepository.update({ address, clientName, sessionId }, { hashRate, deletedAt: null, updatedAt });
+    public async heartbeat(id, hashRate: number, updatedAt: Date) {
+        return await this.clientRepository.update({ id }, { hashRate, deletedAt: null, updatedAt });
     }
 
     // public async save(client: Partial<ClientEntity>) {
@@ -48,8 +48,8 @@ export class ClientService {
         return client as ClientEntity;
     }
 
-    public async delete(sessionId: string) {
-        return await this.clientRepository.softDelete({ sessionId });
+    public async delete(id: string) {
+        return await this.clientRepository.softDelete({ id });
     }
 
     public async deleteOldClients() {
@@ -65,8 +65,8 @@ export class ClientService {
 
     }
 
-    public async updateBestDifficulty(sessionId: string, bestDifficulty: number) {
-        return await this.clientRepository.update({ sessionId }, { bestDifficulty });
+    public async updateBestDifficulty(id: string, bestDifficulty: number) {
+        return await this.clientRepository.update({ id }, { bestDifficulty });
     }
     public async connectedClientCount(): Promise<number> {
         return await this.clientRepository.count();
@@ -111,7 +111,7 @@ export class ClientService {
             .addSelect('MAX(client.bestDifficulty)', 'bestDifficulty')
             .addSelect('SUM(client.hashRate)', 'totalHashRate')
             .groupBy('client.userAgent')
-            .orderBy('count', 'DESC')
+            .orderBy('"totalHashRate"', 'DESC')
             .getRawMany();
         return result;
     }