1 files changed, 37 insertions, 22 deletions

diff --git a/backend/controllers/recordController.go b/backend/controllers/recordController.go
index 3b4bdc7..bafa844 100644
--- a/backend/controllers/recordController.go
+++ b/backend/controllers/recordController.go
@@ -43,11 +43,11 @@ func CreateRecordWithDemo(c *gin.Context) {
                 return
         }
         // Check if map is sp or mp
-        var wrScore int
-        var wrTime int
+        var gameID int
         var isCoop bool
         var isDisabled bool
-        err := database.DB.QueryRow(`SELECT wr_score, wr_time, is_coop, is_disabled FROM maps WHERE id = $1;`, mapId).Scan(&wrScore, &wrTime, &isCoop, &isDisabled)
+        sql := `SELECT game_id, is_disabled FROM maps WHERE id = $1;`
+        err := database.DB.QueryRow(sql, mapId).Scan(&gameID, &isDisabled)
         if err != nil {
                 c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                 return
@@ -56,6 +56,9 @@ func CreateRecordWithDemo(c *gin.Context) {
                 c.JSON(http.StatusBadRequest, models.ErrorResponse("Map is not available for competitive boards."))
                 return
         }
+        if gameID == 2 {
+                isCoop = true
+        }
         // Get record request
         var record models.RecordRequest
         score_count, err := strconv.Atoi(c.PostForm("score_count"))
@@ -104,6 +107,14 @@ func CreateRecordWithDemo(c *gin.Context) {
                 c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                 return
         }
+        // Create database transaction for inserts
+        tx, err := database.DB.Begin()
+        if err != nil {
+                c.JSON(http.StatusInternalServerError, models.ErrorResponse(err.Error()))
+                return
+        }
+        // Defer to a rollback in case anything fails
+        defer tx.Rollback()
         fileID := ""
         for i, header := range files {
                 uuid := uuid.New().String()
@@ -131,7 +142,7 @@ func CreateRecordWithDemo(c *gin.Context) {
                 if i == 1 {
                         partnerDemoUUID = uuid
                 }
-                _, err = database.DB.Exec(`INSERT INTO demos (id,location_id) VALUES ($1,$2)`, uuid, file.Id)
+                _, err = tx.Exec(`INSERT INTO demos (id,location_id) VALUES ($1,$2)`, uuid, file.Id)
                 if err != nil {
                         deleteFile(srv, file.Id)
                         c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
@@ -152,37 +163,41 @@ func CreateRecordWithDemo(c *gin.Context) {
                         partnerID = user.(models.User).SteamID
                         hostID = record.PartnerID
                 }
-                _, err := database.DB.Exec(sql, mapId, record.ScoreCount, record.ScoreTime, hostID, partnerID, hostDemoUUID, partnerDemoUUID)
+                _, err := tx.Exec(sql, mapId, record.ScoreCount, record.ScoreTime, hostID, partnerID, hostDemoUUID, partnerDemoUUID)
                 if err != nil {
                         deleteFile(srv, fileID)
                         c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                         return
                 }
                 // If a new world record based on portal count
-                if record.ScoreCount < wrScore {
-                        _, err := database.DB.Exec(`UPDATE maps SET wr_score = $1, wr_time = $2 WHERE id = $3;`, record.ScoreCount, record.ScoreTime, mapId)
-                        if err != nil {
-                                c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
-                                return
-                        }
-                }
+                // if record.ScoreCount < wrScore {
+                //      _, err := tx.Exec(`UPDATE maps SET wr_score = $1, wr_time = $2 WHERE id = $3;`, record.ScoreCount, record.ScoreTime, mapId)
+                //      if err != nil {
+                //              c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
+                //              return
+                //      }
+                // }
         } else {
                 sql := `INSERT INTO records_sp(map_id,score_count,score_time,user_id,demo_id) 
                 VALUES($1, $2, $3, $4, $5);`
-                _, err := database.DB.Exec(sql, mapId, record.ScoreCount, record.ScoreTime, user.(models.User).SteamID, hostDemoUUID)
+                _, err := tx.Exec(sql, mapId, record.ScoreCount, record.ScoreTime, user.(models.User).SteamID, hostDemoUUID)
                 if err != nil {
                         deleteFile(srv, fileID)
                         c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                         return
                 }
                 // If a new world record based on portal count
-                if record.ScoreCount < wrScore {
-                        _, err := database.DB.Exec(`UPDATE maps SET wr_score = $1, wr_time = $2 WHERE id = $3;`, record.ScoreCount, record.ScoreTime, mapId)
-                        if err != nil {
-                                c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
-                                return
-                        }
-                }
+                // if record.ScoreCount < wrScore {
+                //      _, err := tx.Exec(`UPDATE maps SET wr_score = $1, wr_time = $2 WHERE id = $3;`, record.ScoreCount, record.ScoreTime, mapId)
+                //      if err != nil {
+                //              c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
+                //              return
+                //      }
+                // }
+        }
+        if err = tx.Commit(); err != nil {
+                c.JSON(http.StatusInternalServerError, models.ErrorResponse(err.Error()))
+                return
         }
         c.JSON(http.StatusOK, models.Response{
                 Success: true,
@@ -198,10 +213,10 @@ func CreateRecordWithDemo(c *gin.Context) {
 //      @Tags           demo
 //      @Accept         json
 //      @Produce        octet-stream
-//      @Param          uuid    path            int             true    "Demo UUID"
+//      @Param          uuid    query           int             true    "Demo UUID"
 //      @Success        200             {file}          binary  "Demo File"
 //      @Failure        400             {object}        models.Response
-//      @Router         /demo [get]
+//      @Router         /demos [get]
 func DownloadDemoWithID(c *gin.Context) {
         uuid := c.Query("uuid")
         var locationID string