fix: last sync state is correctly set (#1231)

src/app/app.module.ts

@@ -154,14 +154,14 @@ import { SupportModule } from "./core/support/support.module";
     AttendanceModule,
     DashboardShortcutWidgetModule,
     HistoricalDataModule,
+    SupportModule,
   ],
   providers: [
     { provide: ErrorHandler, useClass: LoggingErrorHandler },
     { provide: MatPaginatorIntl, useValue: TranslatableMatPaginator() },
     { provide: RouteRegistry, useValue: routesRegistry },
     AnalyticsService,
     Angulartics2Matomo,
-    SupportModule,
   ],
   bootstrap: [AppComponent],
 })

src/app/core/session/session-service/synced-session.service.ts

@@ -30,6 +30,7 @@ import { DatabaseUser } from "./local-user";
 import { waitForChangeTo } from "../session-states/session-utils";
 import { PouchDatabase } from "../../database/pouch-database";
 import { zip } from "rxjs";
+import { filter } from "rxjs/operators";
 
 /**
  * A synced session creates and manages a LocalSession and a RemoteSession
@@ -40,6 +41,7 @@ import { zip } from "rxjs";
  */
 @Injectable()
 export class SyncedSessionService extends SessionService {
+  static readonly LAST_SYNC_KEY = "LAST_SYNC";
   private readonly LOGIN_RETRY_TIMEOUT = 60000;
   private readonly POUCHDB_SYNC_BATCH_SIZE = 500;
 
@@ -58,6 +60,14 @@ export class SyncedSessionService extends SessionService {
     super();
     this._localSession = new LocalSession(pouchDatabase);
     this._remoteSession = new RemoteSession(this.httpClient, loggingService);
+    this.syncState
+      .pipe(filter((state) => state === SyncState.COMPLETED))
+      .subscribe(() =>
+        localStorage.setItem(
+          SyncedSessionService.LAST_SYNC_KEY,
+          new Date().toISOString()
+        )
+      );
   }
 
   /**

src/app/core/support/support.module.ts

@@ -2,9 +2,6 @@ import { NgModule } from "@angular/core";
 import { CommonModule } from "@angular/common";
 import { SupportComponent } from "./support/support.component";
 import { MatButtonModule } from "@angular/material/button";
-import { SessionService } from "../session/session-service/session.service";
-import { filter } from "rxjs/operators";
-import { SyncState } from "../session/session-states/sync-state.enum";
 import { ConfirmationDialogModule } from "../confirmation-dialog/confirmation-dialog.module";
 import { FlexModule } from "@angular/flex-layout";
 import { MatExpansionModule } from "@angular/material/expansion";
@@ -22,14 +19,4 @@ import { MatExpansionModule } from "@angular/material/expansion";
 })
 export class SupportModule {
   static dynamicComponents = [SupportComponent];
-  constructor(sessionService: SessionService) {
-    sessionService.syncState
-      .pipe(filter((state) => state === SyncState.COMPLETED))
-      .subscribe(() =>
-        localStorage.setItem(
-          SupportComponent.LAST_SYNC_KEY,
-          new Date().toISOString()
-        )
-      );
-  }
 }

src/app/core/support/support/support.component.spec.ts

@@ -19,6 +19,7 @@ import { ConfirmationDialogService } from "../../confirmation-dialog/confirmatio
 import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { HttpClient } from "@angular/common/http";
 import { NoopAnimationsModule } from "@angular/platform-browser/animations";
+import { SyncedSessionService } from "../../session/session-service/synced-session.service";
 
 describe("SupportComponent", () => {
   let component: SupportComponent;
@@ -76,7 +77,7 @@ describe("SupportComponent", () => {
 
   it("should correctly read sync and remote login status from local storage", () => {
     const lastSync = new Date("2022-01-01").toISOString();
-    localStorage.setItem(SupportComponent.LAST_SYNC_KEY, lastSync);
+    localStorage.setItem(SyncedSessionService.LAST_SYNC_KEY, lastSync);
     const lastRemoteLogin = new Date("2022-01-02").toISOString();
     localStorage.setItem(RemoteSession.LAST_LOGIN_KEY, lastRemoteLogin);
 

src/app/core/support/support/support.component.ts

@@ -11,6 +11,7 @@ import { RemoteSession } from "../../session/session-service/remote-session";
 import { RouteTarget } from "../../../app.routing";
 import { ConfirmationDialogService } from "../../confirmation-dialog/confirmation-dialog.service";
 import { HttpClient } from "@angular/common/http";
+import { SyncedSessionService } from "../../session/session-service/synced-session.service";
 
 @RouteTarget("Support")
 @Component({
@@ -19,7 +20,6 @@ import { HttpClient } from "@angular/common/http";
   styleUrls: ["./support.component.scss"],
 })
 export class SupportComponent implements OnInit {
-  static readonly LAST_SYNC_KEY = "LAST_SYNC";
   currentUser: DatabaseUser;
   currentSyncState: string;
   lastSync: string;
@@ -61,7 +61,7 @@ export class SupportComponent implements OnInit {
 
   private initLastSync() {
     this.lastSync =
-      localStorage.getItem(SupportComponent.LAST_SYNC_KEY) || "never";
+      localStorage.getItem(SyncedSessionService.LAST_SYNC_KEY) || "never";
   }
 
   private initLastRemoteLogin() {