Revert "feat: remove unused endpoints"

This reverts (part of) commit c38cfad.

Author: pieterlukasse

controllers/cohortdefinition.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"net/http"
+	"strconv"
 
 	"github.com/gin-gonic/gin"
 	"github.com/uc-cdis/cohort-middleware/models"
@@ -16,6 +17,24 @@ func NewCohortDefinitionController(cohortDefinitionModel models.CohortDefinition
 	return CohortDefinitionController{cohortDefinitionModel: cohortDefinitionModel}
 }
 
+func (u CohortDefinitionController) RetriveById(c *gin.Context) {
+	cohortDefinitionId := c.Param("id")
+
+	if cohortDefinitionId != "" {
+		cohortDefinitionId, _ := strconv.Atoi(cohortDefinitionId)
+		cohortDefinition, err := u.cohortDefinitionModel.GetCohortDefinitionById(cohortDefinitionId)
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"message": "Error retrieving cohortDefinition", "error": err.Error()})
+			c.Abort()
+			return
+		}
+		c.JSON(http.StatusOK, gin.H{"cohort_definition": cohortDefinition})
+		return
+	}
+	c.JSON(http.StatusBadRequest, gin.H{"message": "bad request"})
+	c.Abort()
+}
+
 func (u CohortDefinitionController) RetriveStatsBySourceIdAndTeamProject(c *gin.Context) {
 	// This method returns ALL cohortdefinition entries with cohort size statistics (for a given source)
 	sourceId, err1 := utils.ParseNumericArg(c, "sourceid")

server/router.go

@@ -29,6 +29,8 @@ func NewRouter() *gin.Engine {
 		authorized.GET("/sources", source.RetriveAll)
 
 		cohortdefinitions := controllers.NewCohortDefinitionController(*new(models.CohortDefinition))
+		authorized.GET("/cohortdefinition/by-id/:id", cohortdefinitions.RetriveById)
+
 		authorized.GET("/cohortdefinition-stats/by-source-id/:sourceid/by-team-project", cohortdefinitions.RetriveStatsBySourceIdAndTeamProject)
 
 		// concept endpoints:

tests/controllers_tests/controllers_test.go

@@ -483,6 +483,45 @@ func TestRetriveStatsBySourceIdAndTeamProject(t *testing.T) {
 	}
 }
 
+func TestRetriveByIdWrongParam(t *testing.T) {
+	setUp(t)
+	requestContext := new(gin.Context)
+	requestContext.Params = append(requestContext.Params, gin.Param{Key: "Abc", Value: "def"})
+	requestContext.Writer = new(tests.CustomResponseWriter)
+	cohortDefinitionController.RetriveById(requestContext)
+	// Params above are wrong, so request should abort:
+	if !requestContext.IsAborted() {
+		t.Errorf("Expected aborted request")
+	}
+}
+
+func TestRetriveById(t *testing.T) {
+	setUp(t)
+	requestContext := new(gin.Context)
+	requestContext.Params = append(requestContext.Params, gin.Param{Key: "id", Value: "1"})
+	requestContext.Writer = new(tests.CustomResponseWriter)
+	cohortDefinitionController.RetriveById(requestContext)
+	result := requestContext.Writer.(*tests.CustomResponseWriter)
+	log.Printf("result: %s", result)
+	// expect result with dummy data:
+	if !strings.Contains(result.CustomResponseWriterOut, "test 1") {
+		t.Errorf("Expected data in result")
+	}
+}
+
+func TestRetriveByIdModelError(t *testing.T) {
+	setUp(t)
+	requestContext := new(gin.Context)
+	requestContext.Params = append(requestContext.Params, gin.Param{Key: "id", Value: "1"})
+	requestContext.Writer = new(tests.CustomResponseWriter)
+	// set flag to let mock model layer return error instead of mock data:
+	dummyModelReturnError = true
+	cohortDefinitionController.RetriveById(requestContext)
+	if !requestContext.IsAborted() {
+		t.Errorf("Expected aborted request")
+	}
+}
+
 func TestRetrieveBreakdownStatsBySourceIdAndCohortId(t *testing.T) {
 	setUp(t)
 	requestContext := new(gin.Context)