Merge pull request #209 from traPtitech/fix/issue194

Fix/issue194

docs/swagger.yaml

@@ -142,6 +142,7 @@ paths:
                   End time: *csvTime
                   Location:
                     type: string
+            example: "Subject, Start date, End date, Start time, End time, Location\n, 2006/01/02, 2006/01/02, 15:04, 15:04, S516\n"
       responses:
         '201':
           $ref: '#/components/responses/RoomArray'

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/gorilla/securecookie v1.1.1
 	github.com/gorilla/sessions v1.2.1
 	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
+	github.com/jszwec/csvutil v1.5.1 // indirect
 	github.com/labstack/echo-contrib v0.8.1-0.20200115200653-2d4a7f3c41d8
 	github.com/labstack/echo/v4 v4.2.0
 	github.com/lestrrat-go/bufferpool v0.0.0-20180220091733-e7784e1b3e37 // indirect

go.sum

@@ -393,6 +393,8 @@ github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/jszwec/csvutil v1.5.1 h1:c3GFBhj6DFMUl4dMK3+B6rz2+LWWS/e9VJiVJ9t9kfQ=
+github.com/jszwec/csvutil v1.5.1/go.mod h1:Rpu7Uu9giO9subDyMCIQfHVDuLrcaC36UA4YcJjGBkg=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=

presentation/room.go

@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/gofrs/uuid"
+	"github.com/traPtitech/knoQ/domain"
 )
 
 //go:generate gotypeconverter -s RoomReq -d domain.WriteRoomParams -o converter.go .
@@ -14,6 +15,15 @@ type RoomReq struct {
 	Admins    []uuid.UUID `json:"admins"`
 }
 
+type RoomCSVReq struct {
+	Subject   string `csv:"Subject"`
+	StartDate string `csv:"Start date"`
+	EndDate   string `csv:"End date"`
+	StartTime string `csv:"Start time"`
+	EndTime   string `csv:"End time"`
+	Location  string `csv:"Location"`
+}
+
 type StartEndTime struct {
 	TimeStart time.Time `json:"timeStart"`
 	TimeEnd   time.Time `json:"timeEnd"`
@@ -32,3 +42,27 @@ type RoomRes struct {
 	CreatedBy   uuid.UUID      `json:"createdBy"`
 	Model
 }
+
+func ChangeRoomCSVReqTodomainWriteRoomParams(src RoomCSVReq, userID uuid.UUID) (*domain.WriteRoomParams, error) {
+
+	layout := "2006/01/02 15:04"
+	jst, _ := time.LoadLocation("Asia/Tokyo")
+	var params domain.WriteRoomParams
+	var err error = nil
+
+	params.Place = src.Location
+	params.TimeStart, err = time.ParseInLocation(layout, src.StartDate+" "+src.StartTime, jst)
+	if err != nil {
+		return nil, err
+	}
+
+	params.TimeEnd, err = time.ParseInLocation(layout, src.EndDate+" "+src.EndTime, jst)
+	if err != nil {
+		return nil, err
+	}
+
+	params.Admins = []uuid.UUID{userID}
+
+	return &params, err
+
+}

router/rooms.go

@@ -26,7 +26,37 @@ func (h *Handlers) HandlePostRoom(c echo.Context) error {
 
 // HandleCreateVerifedRooms csvを解析し、進捗部屋を作成
 func (h *Handlers) HandleCreateVerifedRooms(c echo.Context) error {
-	return c.NoContent(501)
+
+	userID, err := getRequestUserID(c)
+	if err != nil {
+		return notFound(err)
+	}
+
+	var req []presentation.RoomCSVReq
+	if err := c.Bind(&req); err != nil {
+		return badRequest(err)
+	}
+
+	//構造体の変換
+	var RoomsRes []presentation.RoomRes
+
+	for _, v := range req {
+
+		params, err := presentation.ChangeRoomCSVReqTodomainWriteRoomParams(v, userID)
+		if err != nil {
+			return badRequest(err)
+		}
+
+		room, err := h.Repo.CreateVerifiedRoom(*params, getConinfo(c))
+
+		if err != nil {
+			return judgeErrorResponse(err)
+		}
+
+		RoomsRes = append(RoomsRes, presentation.ConvdomainRoomToRoomRes(*room))
+
+	}
+	return c.JSON(http.StatusCreated, RoomsRes)
 }
 
 // HandleGetRoom get one room

router/router.go

@@ -2,10 +2,13 @@
 package router
 
 import (
+	"bytes"
+	"io"
 	"net/http"
 	"strings"
 
 	"github.com/gofrs/uuid"
+	"github.com/jszwec/csvutil"
 	"github.com/traPtitech/knoQ/domain"
 
 	"github.com/gorilla/securecookie"
@@ -32,6 +35,7 @@ func (h *Handlers) SetupRoute() *echo.Echo {
 	echo.NotFoundHandler = NotFoundHandler
 	// echo初期化
 	e := echo.New()
+	e.Binder = &CustomBinder{}
 	e.HTTPErrorHandler = HTTPErrorHandler
 	e.Use(middleware.Recover())
 	e.Use(middleware.Secure())
@@ -156,3 +160,30 @@ func getConinfo(c echo.Context) *domain.ConInfo {
 	info.ReqUserID = uuid.FromStringOrNil(str)
 	return info
 }
+
+type CustomBinder struct{}
+
+func (cb *CustomBinder) Bind(i interface{}, c echo.Context) error {
+	// You may use default binder
+	db := new(echo.DefaultBinder)
+	if err := db.Bind(i, c); err != echo.ErrUnsupportedMediaType {
+		return err
+	}
+
+	// Define your custom implementation here
+	rq := c.Request()
+	ctype := rq.Header.Get(echo.HeaderContentType)
+
+	if strings.HasPrefix(ctype, "text/csv") {
+
+		buf := new(bytes.Buffer)
+		io.Copy(buf, c.Request().Body)
+		data := buf.Bytes()
+		if err := csvutil.Unmarshal(data, i); err != nil {
+			return err
+		}
+		return nil
+	}
+
+	return echo.ErrUnsupportedMediaType
+}