handle sync error

fixes #56
ananthakumaran · Sep 29, 2023 · 374b48e · 374b48e
1 parent fbdecdd
commit 374b48e
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 5 deletions.
diff --git a/cmd/update.go b/cmd/update.go
@@ -23,7 +23,10 @@ var updateCmd = &cobra.Command{
 		syncAll := !updateJournal && !updateCommodities && !updatePortfolios
 
 		if syncAll || updateJournal {
-			model.SyncJournal(db)
+			message, err := model.SyncJournal(db)
+			if err != nil {
+				log.Fatal(message)
+			}
 		}
 
 		if syncAll || updateCommodities {

diff --git a/internal/model/model.go b/internal/model/model.go
@@ -28,9 +28,19 @@ func AutoMigrate(db *gorm.DB) {
 	db.AutoMigrate(&cii.CII{})
 }
 
-func SyncJournal(db *gorm.DB) {
+func SyncJournal(db *gorm.DB) (string, error) {
 	AutoMigrate(db)
 	log.Info("Syncing transactions from journal")
+
+	errors, _, err := ledger.Cli().ValidateFile(config.GetJournalPath())
+	if err != nil {
+		var message string
+		for _, error := range errors {
+			message += error.Message + "\n"
+		}
+		return message, err
+	}
+
 	prices, err := ledger.Cli().Prices(config.GetJournalPath())
 	if err != nil {
 		log.Fatal(err)
@@ -43,6 +53,8 @@ func SyncJournal(db *gorm.DB) {
 		log.Fatal(err)
 	}
 	posting.UpsertAll(db, postings)
+
+	return "", nil
 }
 
 func SyncCommodities(db *gorm.DB) {

diff --git a/internal/server/sync.go b/internal/server/sync.go
@@ -16,7 +16,10 @@ type SyncRequest struct {
 
 func Sync(db *gorm.DB, request SyncRequest) gin.H {
 	if request.Journal {
-		model.SyncJournal(db)
+		message, err := model.SyncJournal(db)
+		if err != nil {
+			return gin.H{"success": false, "message": message}
+		}
 	}
 
 	if request.Prices {

diff --git a/src/lib/components/Actions.svelte b/src/lib/components/Actions.svelte
@@ -1,13 +1,25 @@
 <script lang="ts">
   import { ajax } from "$lib/utils";
+  import * as toast from "bulma-toast";
   import { refresh } from "../../store";
 
   let isLoading = false;
 
   async function sync(request: Record<string, any>) {
     isLoading = true;
     try {
-      await ajax("/api/sync", { method: "POST", body: JSON.stringify(request) });
+      const { success, message } = await ajax("/api/sync", {
+        method: "POST",
+        body: JSON.stringify(request)
+      });
+
+      if (!success) {
+        toast.toast({
+          message: `<b>Failed to sync</b>\n${message}`,
+          type: "is-danger",
+          duration: 5000
+        });
+      }
     } finally {
       isLoading = false;
       refresh();

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -546,7 +546,10 @@ export function ajax(
   options?: RequestInit
 ): Promise<{ file: LedgerFile }>;
 
-export function ajax(route: "/api/sync", options?: RequestInit): Promise<any>;
+export function ajax(
+  route: "/api/sync",
+  options?: RequestInit
+): Promise<{ success: boolean; message: string }>;
 export function ajax(
   route: "/api/price/providers",
   options?: RequestInit