From 4ddfe41f23a09a1a22a79b99bdc0c5a0895cfbc2 Mon Sep 17 00:00:00 2001
From: Nicola Murino <nicola.murino@gmail.com>
Date: Thu, 11 Feb 2021 08:33:32 +0100
Subject: [PATCH] loaddata: restore admins too

---
 service/service.go | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/service/service.go b/service/service.go
index 89a08215..40591be2 100644
--- a/service/service.go
+++ b/service/service.go
@@ -248,13 +248,9 @@ func (s *Service) loadInitialData() error {
 	if err != nil {
 		return fmt.Errorf("unable to parse file to restore %#v: %v", s.LoadDataFrom, err)
 	}
-	err = httpd.RestoreFolders(dump.Folders, s.LoadDataFrom, s.LoadDataMode, s.LoadDataQuotaScan)
+	err = s.restoreDump(dump)
 	if err != nil {
-		return fmt.Errorf("unable to restore folders from file %#v: %v", s.LoadDataFrom, err)
-	}
-	err = httpd.RestoreUsers(dump.Users, s.LoadDataFrom, s.LoadDataMode, s.LoadDataQuotaScan)
-	if err != nil {
-		return fmt.Errorf("unable to restore users from file %#v: %v", s.LoadDataFrom, err)
+		return err
 	}
 	logger.Info(logSender, "", "data loaded from file %#v mode: %v, quota scan %v", s.LoadDataFrom,
 		s.LoadDataMode, s.LoadDataQuotaScan)
@@ -272,3 +268,19 @@ func (s *Service) loadInitialData() error {
 	}
 	return nil
 }
+
+func (s *Service) restoreDump(dump dataprovider.BackupData) error {
+	err := httpd.RestoreAdmins(dump.Admins, s.LoadDataFrom, s.LoadDataMode)
+	if err != nil {
+		return fmt.Errorf("unable to restore folders from file %#v: %v", s.LoadDataFrom, err)
+	}
+	err = httpd.RestoreFolders(dump.Folders, s.LoadDataFrom, s.LoadDataMode, s.LoadDataQuotaScan)
+	if err != nil {
+		return fmt.Errorf("unable to restore folders from file %#v: %v", s.LoadDataFrom, err)
+	}
+	err = httpd.RestoreUsers(dump.Users, s.LoadDataFrom, s.LoadDataMode, s.LoadDataQuotaScan)
+	if err != nil {
+		return fmt.Errorf("unable to restore users from file %#v: %v", s.LoadDataFrom, err)
+	}
+	return nil
+}