Merge pull request #19 from ChristianAE/master

Fix error occurring when attaching a file to a Task

db/files.go

@@ -11,8 +11,12 @@ import (
 
 // AddFile is used to add the md5 of a file name which is uploaded to our application
 // this will enable us to randomize the URL without worrying about the file names
-func AddFile(fileName, token string) error {
+func AddFile(fileName, token, username string) error {
-	err := taskQuery("insert into files values(?,?)", fileName, token)
+	userID, err := GetUserID(username)
+	if err != nil {
+		return err
+	}
+	err = taskQuery("insert into files values(?,?,?,datetime())", fileName, token, userID)
 	return err
 }
 

views/addViews.go

@@ -72,6 +72,7 @@ func AddTaskFunc(w http.ResponseWriter, r *http.Request) {
 
 		cookie, _ := r.Cookie("csrftoken")
 		if formToken == cookie.Value {
+			username := sessions.GetCurrentUserName(r)
 			if handler != nil {
 				// this will be executed whenever a file is uploaded
 				r.ParseMultipartForm(32 << 20) //defined maximum size of file
@@ -95,13 +96,12 @@ func AddTaskFunc(w http.ResponseWriter, r *http.Request) {
 				}
 				content = content + filelink
 
-				fileTruth := db.AddFile(handler.Filename, token)
+				fileTruth := db.AddFile(handler.Filename, token, username)
 				if fileTruth != nil {
 					message = "Error adding filename in db"
 					log.Println("error adding task to db")
 				}
 			}
-			username := sessions.GetCurrentUserName(r)
 			taskTruth := db.AddTask(title, content, category, taskPriority, username)
 
 			if taskTruth != nil {