Merge pull request #110 from mahmednabil109/Add_jobID_to_query

Add job ID to query struct

Author: mimir-d

cmds/admin_server/server/server.go

@@ -19,11 +19,12 @@ var (
 )
 
 type Query struct {
+	JobID     *uint64    `form:"job_id"`
 	Text      *string    `form:"text"`
-	LogLevel  *string    `form:"logLevel"`
-	StartDate *time.Time `form:"startDate" time_format:"2006-01-02T15:04:05.000Z07:00"`
-	EndDate   *time.Time `form:"endDate" time_format:"2006-01-02T15:04:05.000Z07:00"`
-	PageSize  *uint      `form:"pageSize"`
+	LogLevel  *string    `form:"log_level"`
+	StartDate *time.Time `form:"start_date" time_format:"2006-01-02T15:04:05.000Z07:00"`
+	EndDate   *time.Time `form:"end_date" time_format:"2006-01-02T15:04:05.000Z07:00"`
+	PageSize  *uint      `form:"page_size"`
 	Page      *uint      `form:"page"`
 }
 
@@ -34,6 +35,7 @@ func (q *Query) ToStorageQuery() storage.Query {
 		PageSize: MaxPageSize,
 	}
 
+	storageQuery.JobID = q.JobID
 	storageQuery.Text = q.Text
 	storageQuery.LogLevel = q.LogLevel
 	storageQuery.StartDate = q.StartDate
@@ -51,10 +53,10 @@ func (q *Query) ToStorageQuery() storage.Query {
 }
 
 type Log struct {
-	JobID    uint64    `json:"jobID"`
-	LogData  string    `json:"logData"`
+	JobID    uint64    `json:"job_id"`
+	LogData  string    `json:"log_data"`
 	Date     time.Time `json:"date"`
-	LogLevel string    `json:"logLevel"`
+	LogLevel string    `json:"log_level"`
 }
 
 func (l *Log) ToStorageLog() storage.Log {

cmds/admin_server/storage/mongo/mongo.go

@@ -54,6 +54,13 @@ func NewMongoStorage(ctx xcontext.Context, uri string) (storage.Storage, error)
 func toMongoQuery(query storage.Query) bson.D {
 	q := bson.D{}
 
+	if query.JobID != nil {
+		q = append(q, bson.E{
+			Key:   "jobid",
+			Value: *query.JobID,
+		})
+	}
+
 	if query.Text != nil {
 		q = append(q, bson.E{
 			Key: "logdata",

cmds/admin_server/storage/storage.go

@@ -35,6 +35,7 @@ type Log struct {
 
 // Query defines the different options to filter with
 type Query struct {
+	JobID     *uint64
 	Text      *string
 	LogLevel  *string
 	StartDate *time.Time

tests/integ/admin_server/getlogs_test.go

@@ -15,6 +15,7 @@ import (
 	"math/rand"
 	"net/http"
 	"net/url"
+	"strconv"
 	"testing"
 	"time"
 
@@ -100,23 +101,26 @@ func queryLogsEndpoint(query server.Query, retrieveAll bool) (*storage.Result, i
 		var tmp storage.Result
 
 		q := u.Query()
+		if query.JobID != nil {
+			q.Set("job_id", strconv.FormatUint(*query.JobID, 10))
+		}
 		if query.Text != nil {
 			q.Set("text", *query.Text)
 		}
 		if query.StartDate != nil {
-			q.Set("startDate", query.StartDate.Format(storage.DefaultTimestampFormat))
+			q.Set("start_date", query.StartDate.Format(storage.DefaultTimestampFormat))
 		}
 		if query.EndDate != nil {
-			q.Set("endDate", query.EndDate.Format(storage.DefaultTimestampFormat))
+			q.Set("end_date", query.EndDate.Format(storage.DefaultTimestampFormat))
 		}
 		if query.LogLevel != nil {
-			q.Set("logLevel", *query.LogLevel)
+			q.Set("log_level", *query.LogLevel)
 		}
 		if query.Page != nil {
-			q.Set("page", fmt.Sprint(currentPage))
+			q.Set("page", strconv.FormatUint(uint64(currentPage), 10))
 		}
 		if query.PageSize != nil {
-			q.Set("pageSize", fmt.Sprint(*query.PageSize))
+			q.Set("page_size", strconv.FormatUint(uint64(*query.PageSize), 10))
 		}
 
 		u.RawQuery = q.Encode()
@@ -196,6 +200,7 @@ func TestLogQuery(t *testing.T) {
 		endDate                = time.Now().Add(1 * time.Second)
 		searchText      string = "a"
 		emptySearchText string = ""
+		jobID           uint64 = 3
 		page            uint   = 0
 		pageSize        uint   = 20
 		logLevel        string = "info"
@@ -207,6 +212,17 @@ func TestLogQuery(t *testing.T) {
 		apiQuery server.Query
 		dbQuery  bson.M
 	}{
+		{
+			name: "jobID-search",
+			apiQuery: server.Query{
+				JobID:    &jobID,
+				Page:     &page,
+				PageSize: &pageSize,
+			},
+			dbQuery: bson.M{
+				"jobid": jobID,
+			},
+		},
 		{
 			name: "text-search",
 			apiQuery: server.Query{