back port some changes from postgres

src/ORM/address-settings/address-settings.service.ts

@@ -14,9 +14,9 @@ export class AddressSettingsService {
 
     }
 
-    public async getSettings(address: string) {
+    public async getSettings(address: string, createIfNotFound: boolean) {
         const settings = await this.addressSettingsRepository.findOne({ where: { address } });
-        if (settings == null) {
+        if (createIfNotFound == true && settings == null) {
             return await this.createNew(address);
         }
         return settings;

src/ORM/client-statistics/client-statistics.entity.ts

@@ -1,15 +1,16 @@
-import { Column, Entity, Index, PrimaryColumn } from 'typeorm';
+import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
 
 import { TrackedEntity } from '../utils/TrackedEntity.entity';
 
 @Entity({ withoutRowid: true })
-//Index for the heartbeat update
+//Index for getHashRateForSession
+@Index(["address", "clientName", "sessionId"])
+//Index for statistics save
 @Index(["address", "clientName", "sessionId", "time"])
 export class ClientStatisticsEntity extends TrackedEntity {
 
-    @PrimaryColumn({ length: 64, type: 'varchar' })
-    submissionHash: string;
-
+    @PrimaryGeneratedColumn()
+    id: number;
 
     @Column({ length: 62, type: 'varchar' })
     address: string;
@@ -31,6 +32,4 @@ export class ClientStatisticsEntity extends TrackedEntity {
     acceptedCount: number;
 
 
-
-
 }

src/ORM/client-statistics/client-statistics.service.ts

@@ -18,28 +18,38 @@ export class ClientStatisticsService {
     }
 
     public async save(clientStatistic: Partial<ClientStatisticsEntity>) {
-        const res1 = await this.clientStatisticsRepository.createQueryBuilder()
+        // Attempt to update the existing record
+        const updateResult = await this.clientStatisticsRepository
+            .createQueryBuilder()
             .update(ClientStatisticsEntity)
             .set({
-                shares: () => `"shares" + ${clientStatistic.shares}`, // Use the actual value of shares here
+                shares: () => `"shares" + :sharesIncrement`,
                 acceptedCount: () => `"acceptedCount" + 1`
             })
-            .where('address = :address AND clientName = :clientName AND sessionId = :sessionId AND time = :time', { address: clientStatistic.address, clientName: clientStatistic.clientName, sessionId: clientStatistic.sessionId, time: clientStatistic.time })
+            .where('address = :address AND clientName = :clientName AND sessionId = :sessionId AND time = :time', {
+                address: clientStatistic.address,
+                clientName: clientStatistic.clientName,
+                sessionId: clientStatistic.sessionId,
+                time: clientStatistic.time,
+                sharesIncrement: clientStatistic.shares
+            })
             .execute();
 
-        if (res1.affected == 0) {
+        // Check if the update affected any rows
+        if (updateResult.affected === 0) {
+            // If no rows were updated, insert a new record
             await this.clientStatisticsRepository.insert(clientStatistic);
         }
     }
 
     public async deleteOldStatistics() {
-        const eightDays = new Date(Date.now() - 8 * 24 * 60 * 60 * 1000);
+        const oneDayAgo = new Date(Date.now() - 24 * 60 * 60 * 1000);
 
         return await this.clientStatisticsRepository
             .createQueryBuilder()
             .delete()
             .from(ClientStatisticsEntity)
-            .where('time < :time', { time: eightDays.getTime() })
+            .where('time < :time', { time: oneDayAgo.getTime() })
             .execute();
     }
 
@@ -60,7 +70,7 @@ export class ClientStatisticsService {
             ORDER BY
                 time
             LIMIT 144;
-        
+
     `;
 
         const result: any[] = await this.clientStatisticsRepository.query(query);