Holy Logs Fix coz i cooked the merge conflict my bad

Author: BrainNotFoundException

pkg/controllers/logs.go

@@ -3,12 +3,11 @@ package controllers
 import (
 	"encoding/json"
 	"net/http"
-	"time"
 
 	"github.com/CodeChefVIT/devsoc-backend-26/pkg/db"
+	"github.com/CodeChefVIT/devsoc-backend-26/pkg/dto"
 	"github.com/CodeChefVIT/devsoc-backend-26/pkg/elastic"
 	"github.com/CodeChefVIT/devsoc-backend-26/pkg/models"
-	"github.com/CodeChefVIT/devsoc-backend-26/pkg/dto"
 	"github.com/labstack/echo/v4"
 )
 
@@ -35,17 +34,12 @@ func GetLogs(c echo.Context) error {
 			createdBy = &s
 		}
 
-		createdAt := ""
-		if l.CreatedAt.Valid {
-			createdAt = l.CreatedAt.Time.Format(time.RFC3339)
-		}
-
 		resp = append(resp, dto.Log{
 			ID:        l.ID.String(),
 			Type:      l.Type,
 			Body:      body,
 			CreatedBy: createdBy,
-			CreatedAt: createdAt,
+			CreatedAt: l.CreatedAt.Time,
 		})
 	}
 

pkg/dto/logs.go

@@ -5,6 +5,10 @@ import "time"
 type Log struct {
 	ID        string      `json:"id"`
 	Type      string      `json:"type"`
+	Method    string      `json:"method"`
+	URL       string      `json:"url"`
+	IPAddress string      `json:"ip_address"`
+	UserAgent string      `json:"user_agent"`
 	Body      interface{} `json:"body"`
 	CreatedBy *string     `json:"created_by"`
 	CreatedAt time.Time   `json:"created_at"`

pkg/middlewares/logger.go

@@ -62,7 +62,7 @@ func RequestLogger(next echo.HandlerFunc) echo.HandlerFunc {
 			}
 
 			if log.CreatedBy.Valid {
-				idstr := log.CreatedBy.String()
+				idstr := log.CreatedBy.String
 				esLog.CreatedBy = &idstr
 			}