Move fixtures in configuration schema to debugging

PatWie · PatWie · commit 0059de767987 · 2019-12-30T16:28:02.000+01:00
diff --git a/.drone.yml b/.drone.yml
@@ -96,7 +96,6 @@ steps:
   - ls infomark -larth
   - rm infomark
   - go build
-  - mv infomark-backend infomark
   - ls infomark -larth
   environment:
     GOPROXY: https://proxy.golang.org
@@ -153,6 +152,6 @@ services:
 
 ---
 kind: signature
-hmac: cf27858f6349bb3df9711f0dcd1abe40d859ba3e2c2f153e6a405c8742dacd65
+hmac: 29e24a3bd0b40cc6c07dc57cb59a6e13f43e867dc2e26eaf72f4a258bb5ed18f
 
 ...
diff --git a/.infomark-ci.yml b/.infomark-ci.yml
@@ -5,6 +5,7 @@ server:
     user_id: 1
     user_is_root: false
     log_level: debug
+    fixtures: /drone/src/files/fixtures
   http:
     use_https: false
     port: 3000
@@ -60,7 +61,6 @@ server:
     uploads: /drone/src/files/uploads
     common: /drone/src/files/common
     generated_files: /drone/src/files/generated_files
-    fixtures: /drone/src/files/fixtures
 worker:
   version: 1
   services:
diff --git a/api/app/account_test.go b/api/app/account_test.go
@@ -299,7 +299,7 @@ func TestAccount(t *testing.T) {
 			g.Assert(userReturned.AvatarURL.Valid).Equal(false)
 
 			// upload avatar
-			avatarFilename := fmt.Sprintf("%s/default-avatar.jpg", configuration.Configuration.Server.Paths.Fixtures)
+			avatarFilename := fmt.Sprintf("%s/default-avatar.jpg", configuration.Configuration.Server.Debugging.Fixtures)
 			w, err = tape.Upload("/api/v1/account/avatar", avatarFilename, "image/jpg", adminJWT)
 			g.Assert(err).Equal(nil)
 			g.Assert(w.Code).Equal(http.StatusOK)
@@ -342,7 +342,7 @@ func TestAccount(t *testing.T) {
 			g.Assert(userReturned.AvatarURL.Valid).Equal(false)
 
 			// upload avatar
-			avatarFilename := fmt.Sprintf("%s/default-avatar.png", configuration.Configuration.Server.Paths.Fixtures)
+			avatarFilename := fmt.Sprintf("%s/default-avatar.png", configuration.Configuration.Server.Debugging.Fixtures)
 			w, err = tape.Upload("/api/v1/account/avatar", avatarFilename, "image/png", adminJWT)
 			g.Assert(err).Equal(nil)
 			g.Assert(w.Code).Equal(http.StatusOK)
@@ -410,7 +410,7 @@ func TestAccount(t *testing.T) {
 			g.Assert(helper.NewAvatarFileHandle(1).Exists()).Equal(false)
 
 			// upload avatar
-			avatarFilename := fmt.Sprintf("%s/default-avatar.jpg", configuration.Configuration.Server.Paths.Fixtures)
+			avatarFilename := fmt.Sprintf("%s/default-avatar.jpg", configuration.Configuration.Server.Debugging.Fixtures)
 			w, err := tape.Upload("/api/v1/account/avatar", avatarFilename, "image/jpg", noAdminJWT)
 			g.Assert(err).Equal(nil)
 			g.Assert(w.Code).Equal(http.StatusOK)
diff --git a/api/app/grade_test.go b/api/app/grade_test.go
@@ -126,7 +126,7 @@ func TestGrade(t *testing.T) {
 
 			defer hnd.Delete()
 			// now file exists
-			src := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			src := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 			dest := fmt.Sprintf("%s/submissions/%s.zip", configuration.Configuration.Server.Paths.Uploads, strconv.FormatInt(gradeActual.SubmissionID, 10))
 			copyFile(src, dest)
 
diff --git a/api/app/material_test.go b/api/app/material_test.go
@@ -310,7 +310,7 @@ func TestMaterial(t *testing.T) {
 
 			// no file so far
 			g.Assert(helper.NewMaterialFileHandle(1).Exists()).Equal(false)
-			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 
 			// students
 			w, err := tape.Upload("/api/v1/courses/1/materials/1/file", filename, "application/zip", studentJWT)
@@ -338,7 +338,7 @@ func TestMaterial(t *testing.T) {
 
 		g.It("Should upload material file (zip)", func() {
 			defer helper.NewMaterialFileHandle(1).Delete()
-			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 			// admin
 			w, err := tape.Upload("/api/v1/courses/1/materials/1/file", filename, "application/zip", noAdminJWT)
 			g.Assert(err).Equal(nil)
@@ -363,7 +363,7 @@ func TestMaterial(t *testing.T) {
 
 		g.It("Should upload material file (pdf)", func() {
 			defer helper.NewMaterialFileHandle(1).Delete()
-			filename := fmt.Sprintf("%s/empty.pdf", configuration.Configuration.Server.Paths.Fixtures)
+			filename := fmt.Sprintf("%s/empty.pdf", configuration.Configuration.Server.Debugging.Fixtures)
 			// admin
 			w, err := tape.Upload("/api/v1/courses/1/materials/1/file", filename, "application/pdf", noAdminJWT)
 			g.Assert(err).Equal(nil)
diff --git a/api/app/sheet_test.go b/api/app/sheet_test.go
@@ -168,7 +168,7 @@ func TestSheet(t *testing.T) {
 
 			// no file so far
 			g.Assert(helper.NewSheetFileHandle(1).Exists()).Equal(false)
-			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 
 			// students
 			w, err := tape.Upload("/api/v1/courses/1/sheets/1/file", filename, "application/zip", studentJWT)
diff --git a/api/app/submission_test.go b/api/app/submission_test.go
@@ -80,7 +80,7 @@ func TestSubmission(t *testing.T) {
 			// no files so far
 			g.Assert(hnd.Exists()).Equal(false)
 
-			src := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			src := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 			copyFile(src, hnd.Path())
 
 			g.Assert(hnd.Exists()).Equal(true)
@@ -128,7 +128,7 @@ func TestSubmission(t *testing.T) {
 			g.Assert(w.Code).Equal(http.StatusNotFound)
 
 			// upload
-			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 			w, err = tape.Upload("/api/v1/courses/1/tasks/1/submission", filename, "application/zip", studentJWT)
 			g.Assert(err).Equal(nil)
 			g.Assert(w.Code).Equal(http.StatusOK)
@@ -174,7 +174,7 @@ func TestSubmission(t *testing.T) {
 			g.Assert(w.Code).Equal(http.StatusNotFound)
 
 			// upload
-			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 			w, err = tape.Upload("/api/v1/courses/1/tasks/1/submission", filename, "application/zip", studentJWT)
 
 			g.Assert(err).Equal(nil)
@@ -208,7 +208,7 @@ func TestSubmission(t *testing.T) {
 			g.Assert(helper.NewSubmissionFileHandle(3001).Exists()).Equal(false)
 
 			// upload
-			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 			w, err := tape.Upload("/api/v1/courses/1/tasks/1/submission", filename, "application/zip", studentJWT)
 			g.Assert(err).Equal(nil)
 			g.Assert(w.Code).Equal(http.StatusOK)
@@ -242,7 +242,7 @@ func TestSubmission(t *testing.T) {
 			g.Assert(helper.NewSubmissionFileHandle(3001).Exists()).Equal(false)
 
 			// upload
-			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 			w, err := tape.Upload("/api/v1/courses/1/tasks/1/submission", filename, "application/zip", studentJWT)
 			g.Assert(err).Equal(nil)
 			g.Assert(w.Code).Equal(http.StatusBadRequest)
@@ -285,7 +285,7 @@ func TestSubmission(t *testing.T) {
 			g.Assert(err).Equal(nil)
 
 			// upload
-			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 			w, err = tape.Upload("/api/v1/courses/1/tasks/1/submission", filename, "application/zip", studentJWT)
 			g.Assert(err).Equal(nil)
 			g.Assert(w.Code).Equal(http.StatusOK)
@@ -330,7 +330,7 @@ func TestSubmission(t *testing.T) {
 			g.Assert(err).Equal(nil)
 
 			// upload
-			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 			w, err := tape.Upload("/api/v1/courses/1/tasks/1/submission", filename, "application/zip", studentJWT)
 			g.Assert(err).Equal(nil)
 			g.Assert(w.Code).Equal(http.StatusOK)
@@ -378,7 +378,7 @@ func TestSubmission(t *testing.T) {
 			g.Assert(w.Code).Equal(http.StatusNotFound)
 
 			// upload
-			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 			params := map[string]string{
 				"user_id": "112",
 			}
diff --git a/api/app/task_test.go b/api/app/task_test.go
@@ -169,7 +169,7 @@ func TestTask(t *testing.T) {
 			g.Assert(w.Code).Equal(http.StatusNotFound)
 
 			// public test
-			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 			w, err := tape.Upload("/api/v1/courses/1/tasks/1/public_file", filename, "application/zip", adminJWT)
 			g.Assert(err).Equal(nil)
 			g.Assert(w.Code).Equal(http.StatusOK)
@@ -200,7 +200,7 @@ func TestTask(t *testing.T) {
 			g.Assert(w.Code).Equal(http.StatusNotFound)
 
 			// public test
-			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Paths.Fixtures)
+			filename := fmt.Sprintf("%s/empty.zip", configuration.Configuration.Server.Debugging.Fixtures)
 			w, err := tape.Upload("/api/v1/courses/1/tasks/1/private_file", filename, "application/zip", adminJWT)
 			g.Assert(err).Equal(nil)
 			g.Assert(w.Code).Equal(http.StatusOK)
diff --git a/cmd/console/configuration_cmd.go b/cmd/console/configuration_cmd.go
@@ -90,6 +90,7 @@ func GenerateExampleConfiguration(domain string, root_path string) *configuratio
 	config.Server.Debugging.LoginID = int64(1)
 	config.Server.Debugging.LoginIsRoot = false
 	config.Server.Debugging.LogLevel = "debug"
+	config.Server.Debugging.Fixtures = root_path + "/fixtures"
 
 	config.Server.DistributeJobs = true
 
@@ -129,7 +130,6 @@ func GenerateExampleConfiguration(domain string, root_path string) *configuratio
 	config.Server.Paths.Uploads = root_path + "/uploads"
 	config.Server.Paths.Common = root_path + "/common"
 	config.Server.Paths.GeneratedFiles = root_path + "/generated_files"
-	config.Server.Paths.Fixtures = root_path + "/fixtures"
 
 	config.Worker.Version = config.Server.Version
 	config.Worker.Services.RabbitMQ = config.Server.Services.RabbitMQ
@@ -182,7 +182,7 @@ var TestConfiguration = &cobra.Command{
 			db.Close()
 		}
 
-		// Try Redis
+		// Try to connect to Redis
 		option, err := redis.ParseURL(config.Server.RedisURL())
 		showResult(report, err, "test redis url")
 
@@ -195,8 +195,8 @@ var TestConfiguration = &cobra.Command{
 				redisClient.Close()
 			}
 		}
-
 		report.EndDescribe()
+
 		report.BeginDescribe("Test configuration paths")
 		err = fs.DirExists(config.Server.Paths.Common)
 		showResult(report, err, "common path readable")
@@ -207,6 +207,9 @@ var TestConfiguration = &cobra.Command{
 		err = fs.IsDirWriteable(config.Server.Paths.GeneratedFiles)
 		showResult(report, err, "generated_files path writeable")
 
+		privacyFile := fmt.Sprintf("%s/privacy_statement.md", config.Server.Paths.Common)
+		err = fs.FileExists(privacyFile)
+		showResult(report, err, fmt.Sprintf("Read privacy Statement from %s", privacyFile))
 		report.EndDescribe()
 	},
 }
diff --git a/configuration/configuration.go b/configuration/configuration.go
@@ -75,7 +75,6 @@ type PathsConfiguration struct {
 	Uploads        string `yaml:"uploads"`
 	Common         string `yaml:"common"`
 	GeneratedFiles string `yaml:"generated_files"`
-	Fixtures       string `yaml:"fixtures"`
 }
 
 type ServerConfigurationSchema struct {
@@ -85,6 +84,7 @@ type ServerConfigurationSchema struct {
 		LoginID     int64  `yaml:"login_id"`
 		LoginIsRoot bool   `yaml:"login_is_root"`
 		LogLevel    string `yaml:"log_level"`
+		Fixtures    string `yaml:"fixtures"`
 	} `yaml:"debugging"`
 	HTTP struct {
 		UseHTTPS bool `yaml:"use_https"`
diff --git a/configuration/example.yml b/configuration/example.yml
@@ -5,6 +5,7 @@ server:
     login_id: 1
     login_is_root: false
     log_level: debug
+    fixtures: /path/to/fixtures
   http:
     use_https: false
     host: localhost
@@ -61,7 +62,6 @@ server:
     uploads: /path/to/uploads
     common: /path/to/common
     generated_files: /path/to/generated_files
-    fixtures: /path/to/fixtures
 worker:
   version: 1
   services:
diff --git a/configuration/fs/fs.go b/configuration/fs/fs.go
@@ -45,6 +45,18 @@ func DirExists(dir string) error {
 	}
 }
 
+func FileExists(file string) error {
+	if stat, err := os.Stat(file); err != nil {
+		return err
+	} else {
+		if !stat.IsDir() {
+			return nil
+		}
+		return fmt.Errorf("File %v does not exists", file)
+
+	}
+}
+
 func IsDirWriteable(dir string) error {
 	f := filepath.Join(dir, ".check_if_writeable")
 	if err := ioutil.WriteFile(f, []byte(""), PrivateFileMode); err != nil {
