Merge pull request #10 from SwimResults/develop

certificate import from import service

Author: konrad2002

client/athlete_client.go

@@ -6,6 +6,7 @@ import (
 	"github.com/swimresults/athlete-service/dto"
 	"github.com/swimresults/athlete-service/model"
 	"github.com/swimresults/service-core/client"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 	"net/http"
 	"strconv"
 )
@@ -96,3 +97,29 @@ func (c *AthleteClient) ImportAthlete(athlete model.Athlete, meeting string) (*m
 	}
 	return newAthlete, res.StatusCode == http.StatusCreated, nil
 }
+
+func (c *AthleteClient) ImportCertificate(name string, athleteId primitive.ObjectID, meeting string, path string) (*model.Certificate, bool, error) {
+	request := dto.ImportCertificateRequestDto{
+		Name:      name,
+		AthleteId: athleteId,
+		Meeting:   meeting,
+		Path:      path,
+	}
+
+	res, err := client.Post(c.apiUrl, "certificate/import", request, nil)
+	if err != nil {
+		return nil, false, err
+	}
+	defer res.Body.Close()
+
+	newCertificate := &model.Certificate{}
+	err = json.NewDecoder(res.Body).Decode(newCertificate)
+	if err != nil {
+		return nil, false, err
+	}
+
+	if res.StatusCode != http.StatusCreated && res.StatusCode != http.StatusOK {
+		return nil, false, fmt.Errorf("import request returned: %d", res.StatusCode)
+	}
+	return newCertificate, res.StatusCode == http.StatusCreated, nil
+}

controller/certificate_controller.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
+	"github.com/swimresults/athlete-service/dto"
 	"github.com/swimresults/athlete-service/model"
 	"github.com/swimresults/athlete-service/service"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -163,24 +164,18 @@ func updateCertificate(c *gin.Context) {
 }
 
 func importCertificate(c *gin.Context) {
-	//var certificate *model.Certificate
-	//var request dto.ImportCertificateRequestDto
-	//if err := c.BindJSON(&request); err != nil {
-	//	c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": err.Error()})
-	//	return
-	//}
-	//
-	//certificate, r, err := service.ImportCertificate(request.Certificate, request.Meeting)
-	//if err != nil {
-	//	c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": err.Error()})
-	//	return
-	//}
-	//
-	//if r {
-	//	c.IndentedJSON(http.StatusCreated, *certificate)
-	//} else {
-	//	c.IndentedJSON(http.StatusOK, *certificate)
-	//}
-
-	c.IndentedJSON(http.StatusNotImplemented, "")
+	var request dto.ImportCertificateRequestDto
+	if err := c.BindJSON(&request); err != nil {
+		c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": err.Error()})
+		return
+	}
+
+	cert, err := service.ImportCertificate(request)
+	if err != nil {
+		c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": err.Error()})
+		return
+	}
+
+	c.IndentedJSON(http.StatusCreated, cert)
+
 }

dto/import_certificate_request.go

@@ -0,0 +1,12 @@
+package dto
+
+import (
+	"go.mongodb.org/mongo-driver/bson/primitive"
+)
+
+type ImportCertificateRequestDto struct {
+	Name      string             `json:"name"`
+	Meeting   string             `json:"meeting"`
+	AthleteId primitive.ObjectID `json:"athlete_id"`
+	Path      string             `json:"path"`
+}

service/certificate_service.go

@@ -4,11 +4,13 @@ import (
 	"context"
 	"errors"
 	log "github.com/sirupsen/logrus"
+	"github.com/swimresults/athlete-service/dto"
 	"github.com/swimresults/athlete-service/model"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
+	"strings"
 	"time"
 )
 
@@ -134,10 +136,22 @@ func AddCertificate(certificate model.Certificate) (model.Certificate, error) {
 	return GetCertificateById(r.InsertedID.(primitive.ObjectID))
 }
 
-func ImportCertificate(certificate model.Certificate) (*model.Certificate, bool, error) {
+func ImportCertificate(request dto.ImportCertificateRequestDto) (model.Certificate, error) {
+	if request.Path != "" && !strings.HasPrefix(request.Path, "/") {
+		request.Path = "/" + request.Path
+	}
 
-	return nil, false, nil
+	certificate := model.Certificate{
+		Name:      request.Name,
+		AthleteId: request.AthleteId,
+		Meeting:   request.Meeting,
+		Path:      request.Path,
+		Hidden:    false,
+		Downloads: 0,
+		Ordering:  0,
+	}
 
+	return AddCertificate(certificate)
 }
 
 func UpdateCertificate(certificate model.Certificate) (model.Certificate, error) {