Merged in feature/export (pull request #91)

export

* export

api/queryService/api.gen.go

@@ -105,9 +105,6 @@ type ExportTrigger struct {
 		// StartDate This first date of ingestion.
 		StartDate *string `json:"start_date,omitempty"`
 	} `json:"ingestion_filters,omitempty"`
-
-	// JobId The job id of the query results to be exported.
-	JobId openapi_types.UUID `json:"job_id"`
 }
 
 // FieldFilter Filtering a column
@@ -305,15 +302,15 @@ type UpdateClientJSONRequestBody = ClientUpdate
 // CreateJobJSONRequestBody defines body for CreateJob for application/json ContentType.
 type CreateJobJSONRequestBody = JobCreate
 
-// TriggerExportJSONRequestBody defines body for TriggerExport for application/json ContentType.
-type TriggerExportJSONRequestBody = ExportTrigger
-
 // UpdateJobJSONRequestBody defines body for UpdateJob for application/json ContentType.
 type UpdateJobJSONRequestBody = JobUpdate
 
 // UpdateJobCollectorByJobIdJSONRequestBody defines body for UpdateJobCollectorByJobId for application/json ContentType.
 type UpdateJobCollectorByJobIdJSONRequestBody = JobCollectorUpdate
 
+// TriggerExportJSONRequestBody defines body for TriggerExport for application/json ContentType.
+type TriggerExportJSONRequestBody = ExportTrigger
+
 // CreateQueryJSONRequestBody defines body for CreateQuery for application/json ContentType.
 type CreateQueryJSONRequestBody = QueryCreate
 
@@ -337,9 +334,6 @@ type ServerInterface interface {
 	// Create a new job
 	// (POST /job)
 	CreateJob(ctx echo.Context) error
-	// Trigger an export
-	// (POST /job/export)
-	TriggerExport(ctx echo.Context) error
 	// Get a job by ID
 	// (GET /job/{id})
 	GetJob(ctx echo.Context, id openapi_types.UUID) error
@@ -358,6 +352,9 @@ type ServerInterface interface {
 	// Check export state.
 	// (GET /job/{id}/export)
 	ExportState(ctx echo.Context, id openapi_types.UUID) error
+	// Trigger an export
+	// (POST /job/{id}/export)
+	TriggerExport(ctx echo.Context, id openapi_types.UUID) error
 	// Get job status by job ID
 	// (GET /job/{id}/status)
 	GetJobStatusByJobId(ctx echo.Context, id openapi_types.UUID) error
@@ -433,15 +430,6 @@ func (w *ServerInterfaceWrapper) CreateJob(ctx echo.Context) error {
 	return err
 }
 
-// TriggerExport converts echo context to params.
-func (w *ServerInterfaceWrapper) TriggerExport(ctx echo.Context) error {
-	var err error
-
-	// Invoke the callback with all the unmarshaled arguments
-	err = w.Handler.TriggerExport(ctx)
-	return err
-}
-
 // GetJob converts echo context to params.
 func (w *ServerInterfaceWrapper) GetJob(ctx echo.Context) error {
 	var err error
@@ -538,6 +526,22 @@ func (w *ServerInterfaceWrapper) ExportState(ctx echo.Context) error {
 	return err
 }
 
+// TriggerExport converts echo context to params.
+func (w *ServerInterfaceWrapper) TriggerExport(ctx echo.Context) error {
+	var err error
+	// ------------- Path parameter "id" -------------
+	var id openapi_types.UUID
+
+	err = runtime.BindStyledParameterWithOptions("simple", "id", ctx.Param("id"), &id, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true})
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter id: %s", err))
+	}
+
+	// Invoke the callback with all the unmarshaled arguments
+	err = w.Handler.TriggerExport(ctx, id)
+	return err
+}
+
 // GetJobStatusByJobId converts echo context to params.
 func (w *ServerInterfaceWrapper) GetJobStatusByJobId(ctx echo.Context) error {
 	var err error
@@ -652,13 +656,13 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL
 	router.GET(baseURL+"/client/:id", wrapper.GetClient)
 	router.PATCH(baseURL+"/client/:id", wrapper.UpdateClient)
 	router.POST(baseURL+"/job", wrapper.CreateJob)
-	router.POST(baseURL+"/job/export", wrapper.TriggerExport)
 	router.GET(baseURL+"/job/:id", wrapper.GetJob)
 	router.PATCH(baseURL+"/job/:id", wrapper.UpdateJob)
 	router.GET(baseURL+"/job/:id/collector", wrapper.GetJobCollectorByJobId)
 	router.PATCH(baseURL+"/job/:id/collector", wrapper.UpdateJobCollectorByJobId)
 	router.GET(baseURL+"/job/:id/documents", wrapper.ListDocumentsByJobId)
 	router.GET(baseURL+"/job/:id/export", wrapper.ExportState)
+	router.POST(baseURL+"/job/:id/export", wrapper.TriggerExport)
 	router.GET(baseURL+"/job/:id/status", wrapper.GetJobStatusByJobId)
 	router.GET(baseURL+"/query", wrapper.ListQueries)
 	router.POST(baseURL+"/query", wrapper.CreateQuery)
@@ -671,51 +675,50 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL
 // Base64 encoded, gzipped, json marshaled Swagger object
 var swaggerSpec = []string{
 
-	"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",
-	"aUAAAA==",
+	"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",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file

api/queryService/export.go

@@ -7,7 +7,7 @@ import (
 	"github.com/oapi-codegen/runtime/types"
 )
 
-func (s *Controllers) TriggerExport(ctx echo.Context) error {
+func (s *Controllers) TriggerExport(ctx echo.Context, id types.UUID) error {
 	return ctx.JSON(http.StatusOK, map[string]string{"status": "export triggered"})
 }
 

api/queryService/export_test.go

@@ -22,7 +22,9 @@ func TestTriggerExport(t *testing.T) {
 
 	cons := queryservice.NewControllers(validator.New(), &queryservice.Services{})
 
-	err := cons.TriggerExport(ctx)
+	id := uuid.New()
+
+	err := cons.TriggerExport(ctx, id)
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusOK, rec.Code)
 	assert.NotEmpty(t, rec.Body.String())

pkg/queryService/api.gen.go

@@ -103,9 +103,6 @@ type ExportTrigger struct {
 		// StartDate This first date of ingestion.
 		StartDate *string `json:"start_date,omitempty"`
 	} `json:"ingestion_filters,omitempty"`
-
-	// JobId The job id of the query results to be exported.
-	JobId openapi_types.UUID `json:"job_id"`
 }
 
 // FieldFilter Filtering a column
@@ -303,15 +300,15 @@ type UpdateClientJSONRequestBody = ClientUpdate
 // CreateJobJSONRequestBody defines body for CreateJob for application/json ContentType.
 type CreateJobJSONRequestBody = JobCreate
 
-// TriggerExportJSONRequestBody defines body for TriggerExport for application/json ContentType.
-type TriggerExportJSONRequestBody = ExportTrigger
-
 // UpdateJobJSONRequestBody defines body for UpdateJob for application/json ContentType.
 type UpdateJobJSONRequestBody = JobUpdate
 
 // UpdateJobCollectorByJobIdJSONRequestBody defines body for UpdateJobCollectorByJobId for application/json ContentType.
 type UpdateJobCollectorByJobIdJSONRequestBody = JobCollectorUpdate
 
+// TriggerExportJSONRequestBody defines body for TriggerExport for application/json ContentType.
+type TriggerExportJSONRequestBody = ExportTrigger
+
 // CreateQueryJSONRequestBody defines body for CreateQuery for application/json ContentType.
 type CreateQueryJSONRequestBody = QueryCreate
 
@@ -412,11 +409,6 @@ type ClientInterface interface {
 
 	CreateJob(ctx context.Context, body CreateJobJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error)
 
-	// TriggerExportWithBody request with any body
-	TriggerExportWithBody(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error)
-
-	TriggerExport(ctx context.Context, body TriggerExportJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error)
-
 	// GetJob request
 	GetJob(ctx context.Context, id openapi_types.UUID, reqEditors ...RequestEditorFn) (*http.Response, error)
 
@@ -439,6 +431,11 @@ type ClientInterface interface {
 	// ExportState request
 	ExportState(ctx context.Context, id openapi_types.UUID, reqEditors ...RequestEditorFn) (*http.Response, error)
 
+	// TriggerExportWithBody request with any body
+	TriggerExportWithBody(ctx context.Context, id openapi_types.UUID, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error)
+
+	TriggerExport(ctx context.Context, id openapi_types.UUID, body TriggerExportJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error)
+
 	// GetJobStatusByJobId request
 	GetJobStatusByJobId(ctx context.Context, id openapi_types.UUID, reqEditors ...RequestEditorFn) (*http.Response, error)
 
@@ -548,30 +545,6 @@ func (c *Client) CreateJob(ctx context.Context, body CreateJobJSONRequestBody, r
 	return c.Client.Do(req)
 }
 
-func (c *Client) TriggerExportWithBody(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error) {
-	req, err := NewTriggerExportRequestWithBody(c.Server, contentType, body)
-	if err != nil {
-		return nil, err
-	}
-	req = req.WithContext(ctx)
-	if err := c.applyEditors(ctx, req, reqEditors); err != nil {
-		return nil, err
-	}
-	return c.Client.Do(req)
-}
-
-func (c *Client) TriggerExport(ctx context.Context, body TriggerExportJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error) {
-	req, err := NewTriggerExportRequest(c.Server, body)
-	if err != nil {
-		return nil, err
-	}
-	req = req.WithContext(ctx)
-	if err := c.applyEditors(ctx, req, reqEditors); err != nil {
-		return nil, err
-	}
-	return c.Client.Do(req)
-}
-
 func (c *Client) GetJob(ctx context.Context, id openapi_types.UUID, reqEditors ...RequestEditorFn) (*http.Response, error) {
 	req, err := NewGetJobRequest(c.Server, id)
 	if err != nil {
@@ -668,6 +641,30 @@ func (c *Client) ExportState(ctx context.Context, id openapi_types.UUID, reqEdit
 	return c.Client.Do(req)
 }
 
+func (c *Client) TriggerExportWithBody(ctx context.Context, id openapi_types.UUID, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error) {
+	req, err := NewTriggerExportRequestWithBody(c.Server, id, contentType, body)
+	if err != nil {
+		return nil, err
+	}
+	req = req.WithContext(ctx)
+	if err := c.applyEditors(ctx, req, reqEditors); err != nil {
+		return nil, err
+	}
+	return c.Client.Do(req)
+}
+
+func (c *Client) TriggerExport(ctx context.Context, id openapi_types.UUID, body TriggerExportJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error) {
+	req, err := NewTriggerExportRequest(c.Server, id, body)
+	if err != nil {
+		return nil, err
+	}
+	req = req.WithContext(ctx)
+	if err := c.applyEditors(ctx, req, reqEditors); err != nil {
+		return nil, err
+	}
+	return c.Client.Do(req)
+}
+
 func (c *Client) GetJobStatusByJobId(ctx context.Context, id openapi_types.UUID, reqEditors ...RequestEditorFn) (*http.Response, error) {
 	req, err := NewGetJobStatusByJobIdRequest(c.Server, id)
 	if err != nil {
@@ -937,46 +934,6 @@ func NewCreateJobRequestWithBody(server string, contentType string, body io.Read
 	return req, nil
 }
 
-// NewTriggerExportRequest calls the generic TriggerExport builder with application/json body
-func NewTriggerExportRequest(server string, body TriggerExportJSONRequestBody) (*http.Request, error) {
-	var bodyReader io.Reader
-	buf, err := json.Marshal(body)
-	if err != nil {
-		return nil, err
-	}
-	bodyReader = bytes.NewReader(buf)
-	return NewTriggerExportRequestWithBody(server, "application/json", bodyReader)
-}
-
-// NewTriggerExportRequestWithBody generates requests for TriggerExport with any type of body
-func NewTriggerExportRequestWithBody(server string, contentType string, body io.Reader) (*http.Request, error) {
-	var err error
-
-	serverURL, err := url.Parse(server)
-	if err != nil {
-		return nil, err
-	}
-
-	operationPath := fmt.Sprintf("/job/export")
-	if operationPath[0] == '/' {
-		operationPath = "." + operationPath
-	}
-
-	queryURL, err := serverURL.Parse(operationPath)
-	if err != nil {
-		return nil, err
-	}
-
-	req, err := http.NewRequest("POST", queryURL.String(), body)
-	if err != nil {
-		return nil, err
-	}
-
-	req.Header.Add("Content-Type", contentType)
-
-	return req, nil
-}
-
 // NewGetJobRequest generates requests for GetJob
 func NewGetJobRequest(server string, id openapi_types.UUID) (*http.Request, error) {
 	var err error
@@ -1207,6 +1164,53 @@ func NewExportStateRequest(server string, id openapi_types.UUID) (*http.Request,
 	return req, nil
 }
 
+// NewTriggerExportRequest calls the generic TriggerExport builder with application/json body
+func NewTriggerExportRequest(server string, id openapi_types.UUID, body TriggerExportJSONRequestBody) (*http.Request, error) {
+	var bodyReader io.Reader
+	buf, err := json.Marshal(body)
+	if err != nil {
+		return nil, err
+	}
+	bodyReader = bytes.NewReader(buf)
+	return NewTriggerExportRequestWithBody(server, id, "application/json", bodyReader)
+}
+
+// NewTriggerExportRequestWithBody generates requests for TriggerExport with any type of body
+func NewTriggerExportRequestWithBody(server string, id openapi_types.UUID, contentType string, body io.Reader) (*http.Request, error) {
+	var err error
+
+	var pathParam0 string
+
+	pathParam0, err = runtime.StyleParamWithLocation("simple", false, "id", runtime.ParamLocationPath, id)
+	if err != nil {
+		return nil, err
+	}
+
+	serverURL, err := url.Parse(server)
+	if err != nil {
+		return nil, err
+	}
+
+	operationPath := fmt.Sprintf("/job/%s/export", pathParam0)
+	if operationPath[0] == '/' {
+		operationPath = "." + operationPath
+	}
+
+	queryURL, err := serverURL.Parse(operationPath)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", queryURL.String(), body)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Add("Content-Type", contentType)
+
+	return req, nil
+}
+
 // NewGetJobStatusByJobIdRequest generates requests for GetJobStatusByJobId
 func NewGetJobStatusByJobIdRequest(server string, id openapi_types.UUID) (*http.Request, error) {
 	var err error
@@ -1497,11 +1501,6 @@ type ClientWithResponsesInterface interface {
 
 	CreateJobWithResponse(ctx context.Context, body CreateJobJSONRequestBody, reqEditors ...RequestEditorFn) (*CreateJobResponse, error)
 
-	// TriggerExportWithBodyWithResponse request with any body
-	TriggerExportWithBodyWithResponse(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*TriggerExportResponse, error)
-
-	TriggerExportWithResponse(ctx context.Context, body TriggerExportJSONRequestBody, reqEditors ...RequestEditorFn) (*TriggerExportResponse, error)
-
 	// GetJobWithResponse request
 	GetJobWithResponse(ctx context.Context, id openapi_types.UUID, reqEditors ...RequestEditorFn) (*GetJobResponse, error)
 
@@ -1524,6 +1523,11 @@ type ClientWithResponsesInterface interface {
 	// ExportStateWithResponse request
 	ExportStateWithResponse(ctx context.Context, id openapi_types.UUID, reqEditors ...RequestEditorFn) (*ExportStateResponse, error)
 
+	// TriggerExportWithBodyWithResponse request with any body
+	TriggerExportWithBodyWithResponse(ctx context.Context, id openapi_types.UUID, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*TriggerExportResponse, error)
+
+	TriggerExportWithResponse(ctx context.Context, id openapi_types.UUID, body TriggerExportJSONRequestBody, reqEditors ...RequestEditorFn) (*TriggerExportResponse, error)
+
 	// GetJobStatusByJobIdWithResponse request
 	GetJobStatusByJobIdWithResponse(ctx context.Context, id openapi_types.UUID, reqEditors ...RequestEditorFn) (*GetJobStatusByJobIdResponse, error)
 
@@ -1636,28 +1640,6 @@ func (r CreateJobResponse) StatusCode() int {
 	return 0
 }
 
-type TriggerExportResponse struct {
-	Body         []byte
-	HTTPResponse *http.Response
-	JSON201      *IdMessage
-}
-
-// Status returns HTTPResponse.Status
-func (r TriggerExportResponse) Status() string {
-	if r.HTTPResponse != nil {
-		return r.HTTPResponse.Status
-	}
-	return http.StatusText(0)
-}
-
-// StatusCode returns HTTPResponse.StatusCode
-func (r TriggerExportResponse) StatusCode() int {
-	if r.HTTPResponse != nil {
-		return r.HTTPResponse.StatusCode
-	}
-	return 0
-}
-
 type GetJobResponse struct {
 	Body         []byte
 	HTTPResponse *http.Response
@@ -1788,6 +1770,28 @@ func (r ExportStateResponse) StatusCode() int {
 	return 0
 }
 
+type TriggerExportResponse struct {
+	Body         []byte
+	HTTPResponse *http.Response
+	JSON201      *IdMessage
+}
+
+// Status returns HTTPResponse.Status
+func (r TriggerExportResponse) Status() string {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.Status
+	}
+	return http.StatusText(0)
+}
+
+// StatusCode returns HTTPResponse.StatusCode
+func (r TriggerExportResponse) StatusCode() int {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.StatusCode
+	}
+	return 0
+}
+
 type GetJobStatusByJobIdResponse struct {
 	Body         []byte
 	HTTPResponse *http.Response
@@ -1979,23 +1983,6 @@ func (c *ClientWithResponses) CreateJobWithResponse(ctx context.Context, body Cr
 	return ParseCreateJobResponse(rsp)
 }
 
-// TriggerExportWithBodyWithResponse request with arbitrary body returning *TriggerExportResponse
-func (c *ClientWithResponses) TriggerExportWithBodyWithResponse(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*TriggerExportResponse, error) {
-	rsp, err := c.TriggerExportWithBody(ctx, contentType, body, reqEditors...)
-	if err != nil {
-		return nil, err
-	}
-	return ParseTriggerExportResponse(rsp)
-}
-
-func (c *ClientWithResponses) TriggerExportWithResponse(ctx context.Context, body TriggerExportJSONRequestBody, reqEditors ...RequestEditorFn) (*TriggerExportResponse, error) {
-	rsp, err := c.TriggerExport(ctx, body, reqEditors...)
-	if err != nil {
-		return nil, err
-	}
-	return ParseTriggerExportResponse(rsp)
-}
-
 // GetJobWithResponse request returning *GetJobResponse
 func (c *ClientWithResponses) GetJobWithResponse(ctx context.Context, id openapi_types.UUID, reqEditors ...RequestEditorFn) (*GetJobResponse, error) {
 	rsp, err := c.GetJob(ctx, id, reqEditors...)
@@ -2066,6 +2053,23 @@ func (c *ClientWithResponses) ExportStateWithResponse(ctx context.Context, id op
 	return ParseExportStateResponse(rsp)
 }
 
+// TriggerExportWithBodyWithResponse request with arbitrary body returning *TriggerExportResponse
+func (c *ClientWithResponses) TriggerExportWithBodyWithResponse(ctx context.Context, id openapi_types.UUID, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*TriggerExportResponse, error) {
+	rsp, err := c.TriggerExportWithBody(ctx, id, contentType, body, reqEditors...)
+	if err != nil {
+		return nil, err
+	}
+	return ParseTriggerExportResponse(rsp)
+}
+
+func (c *ClientWithResponses) TriggerExportWithResponse(ctx context.Context, id openapi_types.UUID, body TriggerExportJSONRequestBody, reqEditors ...RequestEditorFn) (*TriggerExportResponse, error) {
+	rsp, err := c.TriggerExport(ctx, id, body, reqEditors...)
+	if err != nil {
+		return nil, err
+	}
+	return ParseTriggerExportResponse(rsp)
+}
+
 // GetJobStatusByJobIdWithResponse request returning *GetJobStatusByJobIdResponse
 func (c *ClientWithResponses) GetJobStatusByJobIdWithResponse(ctx context.Context, id openapi_types.UUID, reqEditors ...RequestEditorFn) (*GetJobStatusByJobIdResponse, error) {
 	rsp, err := c.GetJobStatusByJobId(ctx, id, reqEditors...)
@@ -2238,32 +2242,6 @@ func ParseCreateJobResponse(rsp *http.Response) (*CreateJobResponse, error) {
 	return response, nil
 }
 
-// ParseTriggerExportResponse parses an HTTP response from a TriggerExportWithResponse call
-func ParseTriggerExportResponse(rsp *http.Response) (*TriggerExportResponse, error) {
-	bodyBytes, err := io.ReadAll(rsp.Body)
-	defer func() { _ = rsp.Body.Close() }()
-	if err != nil {
-		return nil, err
-	}
-
-	response := &TriggerExportResponse{
-		Body:         bodyBytes,
-		HTTPResponse: rsp,
-	}
-
-	switch {
-	case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 201:
-		var dest IdMessage
-		if err := json.Unmarshal(bodyBytes, &dest); err != nil {
-			return nil, err
-		}
-		response.JSON201 = &dest
-
-	}
-
-	return response, nil
-}
-
 // ParseGetJobResponse parses an HTTP response from a GetJobWithResponse call
 func ParseGetJobResponse(rsp *http.Response) (*GetJobResponse, error) {
 	bodyBytes, err := io.ReadAll(rsp.Body)
@@ -2400,6 +2378,32 @@ func ParseExportStateResponse(rsp *http.Response) (*ExportStateResponse, error)
 	return response, nil
 }
 
+// ParseTriggerExportResponse parses an HTTP response from a TriggerExportWithResponse call
+func ParseTriggerExportResponse(rsp *http.Response) (*TriggerExportResponse, error) {
+	bodyBytes, err := io.ReadAll(rsp.Body)
+	defer func() { _ = rsp.Body.Close() }()
+	if err != nil {
+		return nil, err
+	}
+
+	response := &TriggerExportResponse{
+		Body:         bodyBytes,
+		HTTPResponse: rsp,
+	}
+
+	switch {
+	case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 201:
+		var dest IdMessage
+		if err := json.Unmarshal(bodyBytes, &dest); err != nil {
+			return nil, err
+		}
+		response.JSON201 = &dest
+
+	}
+
+	return response, nil
+}
+
 // ParseGetJobStatusByJobIdResponse parses an HTTP response from a GetJobStatusByJobIdWithResponse call
 func ParseGetJobStatusByJobIdResponse(rsp *http.Response) (*GetJobStatusByJobIdResponse, error) {
 	bodyBytes, err := io.ReadAll(rsp.Body)

serviceAPIs/queryService.yaml

@@ -355,29 +355,6 @@ paths:
         "400":
           description: Invalid request body.
 
-  /job/export:
-    post:
-      operationId: triggerExport
-      tags:
-        - ExportService
-      summary: Trigger an export
-      description: Initiates the export process.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/ExportTrigger"
-      responses:
-        "201":
-          description: Export triggered successfully.
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/IdMessage"
-        "400":
-          description: Invalid request body.
-
   /job/{id}/export:
     parameters:
       - in: path
@@ -402,6 +379,27 @@ paths:
                 $ref: "#/components/schemas/ExportDetails"
         "400":
           description: Invalid body.
+    post:
+      operationId: triggerExport
+      tags:
+        - ExportService
+      summary: Trigger an export
+      description: Initiates the export process.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/ExportTrigger"
+      responses:
+        "201":
+          description: Export triggered successfully.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/IdMessage"
+        "400":
+          description: Invalid request body.
 
 components:
   schemas:
@@ -717,10 +715,6 @@ components:
     ExportTrigger:
       type: object
       properties:
-        job_id:
-          type: string
-          format: uuid
-          description: The job id of the query results to be exported.
         ingestion_filters:
           type: object
           description: Filter the scope based on ingestion parameters.
@@ -737,8 +731,6 @@ components:
           items:
             $ref: "#/components/schemas/FieldFilter"
       description: Payload for triggering an export.
-      required:
-        - job_id
 
     FieldFilter:
       type: object

test/queryService/exportservice_test.go

@@ -7,6 +7,7 @@ import (
 	"queryorchestration/internal/test"
 	queryservice "queryorchestration/pkg/queryService"
 
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -25,7 +26,9 @@ func TestExportService(t *testing.T) {
 	client, err := queryservice.NewClientWithResponses(c.URI)
 	assert.NoError(t, err)
 
-	idRes, err := client.TriggerExportWithResponse(ctx, queryservice.ExportTrigger{})
+	id := uuid.New()
+
+	idRes, err := client.TriggerExportWithResponse(ctx, id, queryservice.ExportTrigger{})
 	assert.NoError(t, err)
 	assert.NotNil(t, idRes)
 }