diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e499b1..265f09f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,23 +1,7 @@ include: - project: 'developerdurp/yml' ref: main - file: 'pipelines/build-container.yml' + file: 'pipelines/golang.yml' variables: GIN_MODE: release - SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache - GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task - -sonarcloud-check: - stage: .pre - image: - name: sonarsource/sonar-scanner-cli:latest - entrypoint: [""] - cache: - key: "${CI_JOB_NAME}" - paths: - - .sonar/cache - script: - - sonar-scanner - rules: - - if: $CI_COMMIT_REF_NAME == 'main' || $CI_PIPELINE_SOURCE == 'merge_request_event' \ No newline at end of file diff --git a/controller/health.go b/controller/health.go index fb9bf49..0d1a5a1 100644 --- a/controller/health.go +++ b/controller/health.go @@ -17,5 +17,5 @@ import ( // @Router /health/getHealth [get] func (c *Controller) GetHealth(ctx *gin.Context) { // Return the health in the response body - ctx.JSON(http.StatusOK, gin.H{"health": "OK"}) + ctx.JSON(http.StatusOK, gin.H{"message": "OK"}) } diff --git a/controller/openai.go b/controller/openai.go index d7b369e..fb7fee8 100644 --- a/controller/openai.go +++ b/controller/openai.go @@ -26,7 +26,7 @@ func (c *Controller) GeneralOpenAI(ctx *gin.Context) { ctx.AbortWithError(http.StatusInternalServerError, err) } - ctx.String(http.StatusOK, result) + ctx.JSON(http.StatusOK, gin.H{"message": result}) } // TravelAgentOpenAI godoc @@ -40,14 +40,14 @@ func (c *Controller) GeneralOpenAI(ctx *gin.Context) { // @Success 200 {string} string "response" // @Router /openai/travelagent [get] func (c *Controller) TravelAgentOpenAI(ctx *gin.Context) { - message := "want you to act as a travel guide. I will give you my location and you will give me suggestions " + ctx.Query("message") + message := "I want you to act as a travel guide. I will give you my location and you will give me suggestions. " + ctx.Query("message") result, err := createChatCompletion(c, message) if err != nil { ctx.AbortWithError(http.StatusInternalServerError, err) } - ctx.String(http.StatusOK, result) + ctx.JSON(http.StatusOK, gin.H{"message": result}) } func createChatCompletion(c *Controller, message string) (string, error) {