admin: Refactor synchronization status report + display last git error

admin/api/sync.go

@@ -7,6 +7,7 @@ import (
 	"net/url"
 	"os"
 	"path"
+	"reflect"
 	"strings"
 
 	"srs.epita.fr/fic-server/admin/generation"
@@ -17,6 +18,8 @@ import (
 	"go.uber.org/multierr"
 )
 
+var lastSyncError = ""
+
 func flatifySyncErrors(errs error) (ret []string) {
 	for _, err := range multierr.Errors(errs) {
 		ret = append(ret, err.Error())
@@ -27,12 +30,37 @@ func flatifySyncErrors(errs error) (ret []string) {
 func declareSyncRoutes(router *gin.RouterGroup) {
 	apiSyncRoutes := router.Group("/sync")
 
+	// Return the global sync status
+	apiSyncRoutes.GET("/status", func(c *gin.Context) {
+		syncMtd := "Disabled"
+		if sync.GlobalImporter != nil {
+			syncMtd = sync.GlobalImporter.Kind()
+		}
+
+		var syncId *string
+		if sync.GlobalImporter != nil {
+			syncId = sync.GlobalImporter.Id()
+		}
+
+		c.JSON(http.StatusOK, gin.H{
+			"sync-type": reflect.TypeOf(sync.GlobalImporter).Name(),
+			"sync-id":   syncId,
+			"sync":      syncMtd,
+			"pullMutex": !sync.OneGitPullStatus(),
+			"syncMutex": !sync.OneDeepSyncStatus() && !sync.OneThemeDeepSyncStatus(),
+			"progress":  sync.DeepSyncProgress,
+			"lastError": lastSyncError,
+		})
+	})
+
 	// Base sync checks if the local directory is in sync with remote one.
 	apiSyncRoutes.POST("/base", func(c *gin.Context) {
 		err := sync.GlobalImporter.Sync()
 		if err != nil {
+			lastSyncError = err.Error()
 			c.JSON(http.StatusExpectationFailed, gin.H{"errmsg": err.Error()})
 		} else {
+			lastSyncError = ""
 			c.JSON(http.StatusOK, true)
 		}
 	})
@@ -45,15 +73,10 @@ func declareSyncRoutes(router *gin.RouterGroup) {
 	})
 
 	// Deep sync: a fully recursive synchronization (can be limited by theme).
-	apiSyncRoutes.GET("/deep", func(c *gin.Context) {
-		if sync.DeepSyncProgress == 0 {
-			c.AbortWithStatusJSON(http.StatusTooEarly, gin.H{"errmsg": "Pas de synchronisation en cours"})
-			return
-		}
-		c.JSON(http.StatusOK, gin.H{"progress": sync.DeepSyncProgress})
-	})
 	apiSyncRoutes.POST("/deep", func(c *gin.Context) {
-		c.JSON(http.StatusOK, sync.SyncDeep(sync.GlobalImporter))
+		r := sync.SyncDeep(sync.GlobalImporter)
+		lastSyncError = ""
+		c.JSON(http.StatusOK, r)
 	})
 
 	apiSyncDeepRoutes := apiSyncRoutes.Group("/deep/:thid")
@@ -66,6 +89,7 @@ func declareSyncRoutes(router *gin.RouterGroup) {
 		}
 		sync.EditDeepReport(&sync.SyncReport{Exercices: st}, false)
 		sync.DeepSyncProgress = 255
+		lastSyncError = ""
 		c.JSON(http.StatusOK, st)
 	})
 	apiSyncDeepRoutes.POST("", func(c *gin.Context) {
@@ -79,6 +103,7 @@ func declareSyncRoutes(router *gin.RouterGroup) {
 		}
 		sync.EditDeepReport(&sync.SyncReport{Themes: map[string][]string{theme.Name: st}}, false)
 		sync.DeepSyncProgress = 255
+		lastSyncError = ""
 		c.JSON(http.StatusOK, st)
 	})
 
@@ -90,6 +115,7 @@ func declareSyncRoutes(router *gin.RouterGroup) {
 
 	apiSyncRoutes.POST("/themes", func(c *gin.Context) {
 		_, errs := sync.SyncThemes(sync.GlobalImporter)
+		lastSyncError = ""
 		c.JSON(http.StatusOK, flatifySyncErrors(errs))
 	})