upstream sync

2023-10-10 08:39:50 +02:00
parent 598f706958
commit d3011d77ff
5 changed files with 139 additions and 58 deletions
--- a/controllers/contracts_controller.go
+++ b/controllers/contracts_controller.go
@@ -1,6 +1,7 @@
 package controllers

 import (
+	"encoding/json"
 	"log"
 	"net/http"
 	"strconv"
@@ -19,61 +20,61 @@ func GetLatestContracts(c *gin.Context) {
    offsetStr := c.DefaultQuery("offset", "0")
    status := strings.Split(c.DefaultQuery("status", models.ContractStatusActive), ",")

-    // New/Updated optional parameters
-    companyName := c.Query("company_name")
-    companyAddress := c.Query("company_address")
-    companyEmail := c.Query("company_email")
-    companyPhone := c.Query("company_phone")
-    contractName := c.Query("contract_name")
-    startTimeStr := c.Query("start_time")
-    endTimeStr := c.Query("end_time")
-    deviceIDsStr := c.QueryArray("deviceIDs[]")
+	// New/Updated optional parameters
+	companyName := c.Query("company_name")
+	companyAddress := c.Query("company_address")
+	companyEmail := c.Query("company_email")
+	companyPhone := c.Query("company_phone")
+	contractName := c.Query("contract_name")
+	startTimeStr := c.Query("start_time")
+	endTimeStr := c.Query("end_time")
+	deviceIDsStr := c.QueryArray("deviceIDs[]")

-    // Convert limit and offset to int
-    limit, err := strconv.Atoi(limitStr)
-    if err != nil {
-        c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid limit value"})
-        return
-    }
+	// Convert limit and offset to int
+	limit, err := strconv.Atoi(limitStr)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid limit value"})
+		return
+	}

-    offset, err := strconv.Atoi(offsetStr)
-    if err != nil {
-        c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid offset value"})
-        return
-    }
+	offset, err := strconv.Atoi(offsetStr)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid offset value"})
+		return
+	}

-    // Convert startTime to time.Time
-    var startTime time.Time
-    if startTimeStr != "" {
-        startTimeUnix, err := strconv.ParseInt(startTimeStr, 10, 64)
-        if err != nil {
-            c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid start_time value"})
-            return
-        }
-        startTime = time.Unix(startTimeUnix, 0)
-    }
+	// Convert startTime to time.Time
+	var startTime time.Time
+	if startTimeStr != "" {
+		startTimeUnix, err := strconv.ParseInt(startTimeStr, 10, 64)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid start_time value"})
+			return
+		}
+		startTime = time.Unix(startTimeUnix, 0)
+	}

-    // Convert endTime to time.Time
-    var endTime time.Time
-    if endTimeStr != "" {
-        endTimeUnix, err := strconv.ParseInt(endTimeStr, 10, 64)
-        if err != nil {
-            c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid end_time value"})
-            return
-        }
-        endTime = time.Unix(endTimeUnix, 0)
-    }
+	// Convert endTime to time.Time
+	var endTime time.Time
+	if endTimeStr != "" {
+		endTimeUnix, err := strconv.ParseInt(endTimeStr, 10, 64)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid end_time value"})
+			return
+		}
+		endTime = time.Unix(endTimeUnix, 0)
+	}

-    // Convert deviceIDs to []int64
-    var deviceIDs []int64
-    for _, idStr := range deviceIDsStr {
-        id, err := strconv.ParseInt(idStr, 10, 64)
-        if err != nil {
-            c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid deviceID value"})
-            return
-        }
-        deviceIDs = append(deviceIDs, id)
-    }
+	// Convert deviceIDs to []int64
+	var deviceIDs []int64
+	for _, idStr := range deviceIDsStr {
+		id, err := strconv.ParseInt(idStr, 10, 64)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid deviceID value"})
+			return
+		}
+		deviceIDs = append(deviceIDs, id)
+	}

    // Fetch contracts
 	contracts, total, st, err := contract.GetContracts(status, companyName, companyAddress, companyEmail, companyPhone, &startTime, &endTime, contractName, deviceIDs, 0, nil, limit, offset)
@@ -139,7 +140,7 @@ func GetBuyerContracts(c *gin.Context) {
        return
    }

-    // Respond with the contracts and the total count
+	// Respond with the contracts and the total count
    c.JSON(http.StatusOK, gin.H{"total": total, "data": models.ConvertContractToResponseModel(contracts)})
 }

@@ -187,4 +188,73 @@ func CreateContract(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{"message": "Successfully received and saved contract", "id": newContract.ID})
 }

+func GetContractByID(c *gin.Context) {
+	// Get the contract ID from url parameters
+	contractIDStr := c.Param("contract_id")
+
+	if contractIDStr == "" {
+		log.Printf("GetContractByID Error: ID is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "ID is required"})
+		return
+	}
+
+	contractID, err := strconv.ParseUint(contractIDStr, 10, 32)
+	if err != nil {
+		log.Printf("GetContractByID Error: Invalid ID: %v", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid ID"})
+		return
+	}
+
+	// Fetch contract
+	contract, st, err := contract.GetContractByID(contractID)
+	if err != nil {
+		c.JSON(st, gin.H{"error": err.Error()})
+		return
+	}
+
+	// Respond with the contracts and the total count
+	c.JSON(http.StatusOK, gin.H{"data": contract})
+}
+
+func UpdateContract(c *gin.Context) {
+
+	var contractModel models.Contract
+	rawData, _ := c.GetRawData()
+
+	// Unmarshal to the important info structure
+	err := json.Unmarshal(rawData, &contractModel)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid JSON payload"})
+		log.Printf("Invalid json pyload : %v", err)
+		return
+	}
+
+	// Get the contract ID from url parameters
+	contractIDStr := c.Param("contract_id")
+
+	if contractIDStr == "" {
+		log.Printf("UpdateContract Error: ID is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "ID is required"})
+		return
+	}
+
+	contractID, err := strconv.ParseUint(contractIDStr, 10, 32)
+	if err != nil {
+		log.Printf("UpdateContract Error: Invalid ID: %v", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid ID"})
+		return
+	}
+
+	contractModel.ID = uint(contractID)
+
+	// update contract
+	contractModel, st, err := contract.UpdateContract(contractModel)
+	if err != nil {
+		c.JSON(st, gin.H{"error": err.Error()})
+		return
+	}
+
+	// Respond with the contracts and the total count
+	c.JSON(http.StatusOK, gin.H{"data": contractModel})
+}