Refactoring for better handling of new endpoints

backend/api/internal/database/project_queries.go

@@ -2,135 +2,104 @@ package database
 
 import (
 	"database/sql"
-	"encoding/json"
 	"fmt"
 
-	"backend/api/internal/logger"
 	"backend/api/internal/types"
 )
 
 func QueryProject(id int) (*types.Project, error) {
-    query := `SELECT id, name, description, status, likes, links, tags, owner, creation_date FROM Projects WHERE id = ?;`
-
-    row := DB.QueryRow(query, id)
-    var project types.Project
-    var linksJSON, tagsJSON string
-
-    err := row.Scan(
-        &project.ID,
-        &project.Name,
-        &project.Description,
-        &project.Status,
-        &project.Likes,
-        &linksJSON,
-        &tagsJSON,
-        &project.Owner,
-        &project.CreationDate,
-    )
-    if err != nil {
-        if err == sql.ErrNoRows {
-            logger.Log.Infof("No project found with id: %d", id)
-            return nil, nil
-        }
-        return nil, err
-    }
-
-    if err := json.Unmarshal([]byte(linksJSON), &project.Links); err != nil {
-        logger.Log.Infof("Error parsing links JSON: %v", err)
-        return nil, fmt.Errorf("Error parsing links JSON: %v", err)
-    }
-    if err := json.Unmarshal([]byte(tagsJSON), &project.Tags); err != nil {
-        logger.Log.Infof("Error parsing tags JSON: %v", err)
-        return nil, fmt.Errorf("Error parsing tags JSON: %v", err)
-    }
-
-    return &project, nil
+	query := `SELECT id, name, description, status, likes, links, tags, owner, creation_date FROM Projects WHERE id = ?;`
+	row := DB.QueryRow(query, id)
+	var project types.Project
+	var linksJSON, tagsJSON string
+
+	err := row.Scan(
+		&project.ID,
+		&project.Name,
+		&project.Description,
+		&project.Status,
+		&project.Likes,
+		&linksJSON,
+		&tagsJSON,
+		&project.Owner,
+		&project.CreationDate,
+	)
+	if err != nil {
+		if err == sql.ErrNoRows {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	if err := UnmarshalFromJSON(linksJSON, &project.Links); err != nil {
+		return nil, err
+	}
+	if err := UnmarshalFromJSON(tagsJSON, &project.Tags); err != nil {
+		return nil, err
+	}
+
+	return &project, nil
 }
 
 func QueryCreateProject(proj *types.Project) (int64, error) {
-	linksJSON, err := json.Marshal(proj.Links)
+	linksJSON, err := MarshalToJSON(proj.Links)
 	if err != nil {
-		logger.Log.Errorf("Failed to marshal links for project `%v`: %v", proj.Name, err)
-		return -1, fmt.Errorf("Failed to marshal links for project `%v`: %v", proj.Name, err)
+		return -1, err
 	}
 
-	tagsJSON, err := json.Marshal(proj.Tags)
+	tagsJSON, err := MarshalToJSON(proj.Tags)
 	if err != nil {
-		logger.Log.Errorf("Failed to marshal tags for project `%v`: %v", proj.Name, err)
-		return -1, fmt.Errorf("Failed to marshal tags for project `%v`: %v", proj.Name, err)
+		return -1, err
 	}
-    query := `INSERT INTO Projects (name, description, status, links, tags, owner)
-              VALUES (?, ?, ?, ?, ?, ?);`
 
-    res, err := DB.Exec(query, proj.Name, proj.Description, proj.Status, string(linksJSON), string(tagsJSON), proj.Owner)
+	query := `INSERT INTO Projects (name, description, status, links, tags, owner)
+              VALUES (?, ?, ?, ?, ?, ?);`
 
-    if err != nil {
-        logger.Log.Errorf("Failed to create project `%v`: `%v", proj.Name, err)
-    }
+	res, err := DB.Exec(query, proj.Name, proj.Description, proj.Status, string(linksJSON), string(tagsJSON), proj.Owner)
+	if err != nil {
+		return -1, fmt.Errorf("Failed to create project `%v`: %v", proj.Name, err)
+	}
 
 	lastId, err := res.LastInsertId()
 	if err != nil {
-		logger.Log.Errorf("Failed to ensure proj was created: %v", err)
 		return -1, fmt.Errorf("Failed to ensure proj was created: %v", err)
 	}
 
-	logger.Log.Infof("Created proj %v with id `%v`", proj.Name, lastId)
 	return lastId, nil
 }
 
 func QueryDeleteProject(id int) (int16, error) {
 	query := `DELETE from Projects WHERE id=?;`
 	res, err := DB.Exec(query, id)
 	if err != nil {
-		logger.Log.Errorf("Failed to delete project `%v`: %v", id, err)
 		return 400, fmt.Errorf("Failed to delete project `%v`: %v", id, err)
 	}
 
-	RowsAffected, err := res.RowsAffected()
-	if RowsAffected == 0 {
-		logger.Log.Errorf("Deletion did not affect any records")
+	rowsAffected, err := res.RowsAffected()
+	if rowsAffected == 0 {
 		return 404, fmt.Errorf("Deletion did not affect any records")
 	} else if err != nil {
-		logger.Log.Errorf("Failed to fetch affected rows: %v", err)
 		return 500, fmt.Errorf("Failed to fetch affected rows: %v", err)
 	}
 
-	logger.Log.Infof("Deleted project %v.", id)
 	return 200, nil
 }
 
 func QueryUpdateProject(id int, updatedData map[string]interface{}) error {
-    query := `UPDATE Projects SET `
-    var args []interface{}
-
-    for key, value := range updatedData {
-        switch key {
-        case "links", "tags":
-            jsonData, err := json.Marshal(value)
-            if err != nil {
-                return fmt.Errorf("Error marshaling list data: %v", err)
-            }
-            query += fmt.Sprintf("%v = ?, ", key)
-            args = append(args, string(jsonData))
-        default:
-            query += fmt.Sprintf("%v = ?, ", key)
-            args = append(args, value)
-        }
-    }
-	// continue formatting query
-	// get rid of trailing space and comma
-	query = query[:len(query)-2]
-	query += " WHERE id = ?"
-	args = append(args, id)
+	query := `UPDATE Projects SET `
+	var args []interface{}
 
-	res, err := DB.Exec(query, args...)
+	queryParams, args, err := BuildUpdateQuery(updatedData)
 	if err != nil {
-		return fmt.Errorf("Error executing update query: %v", err)
+		return fmt.Errorf("Error building query: %v", err)
 	}
 
-	rowsAffected, err := res.RowsAffected()
+	query += queryParams + " WHERE id = ?"
+	args = append(args, id)
+
+	rowsAffected, err := ExecUpdate(query, args...)
 	if err != nil {
-		return fmt.Errorf("Error checking rows affected: %v", err)
+		return fmt.Errorf("Error executing update query: %v", err)
 	}
 	if rowsAffected == 0 {
 		return fmt.Errorf("No project found with id `%d` to update", id)