feature. refactoring repository interface

api/swagger/docs.go

@@ -1606,14 +1606,6 @@ const docTemplate = `{
                     "Stacks"
                 ],
                 "summary": "Get Stacks",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "show all organizations",
-                        "name": "all",
-                        "in": "query"
-                    }
-                ],
                 "responses": {
                     "200": {
                         "description": "OK",

api/swagger/swagger.json

@@ -1599,14 +1599,6 @@
                     "Stacks"
                 ],
                 "summary": "Get Stacks",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "show all organizations",
-                        "name": "all",
-                        "in": "query"
-                    }
-                ],
                 "responses": {
                     "200": {
                         "description": "OK",

api/swagger/swagger.yaml

@@ -2096,11 +2096,6 @@ paths:
       consumes:
       - application/json
       description: Get Stacks
-      parameters:
-      - description: show all organizations
-        in: query
-        name: all
-        type: string
       produces:
       - application/json
       responses:

cmd/server/main.go

@@ -18,6 +18,7 @@ import (
 )
 
 func init() {
+	flag.String("external-address", "http://tks-api.tks.svc:9110", "service address")
 	flag.Int("port", 8080, "service port")
 	flag.String("web-root", "../../web", "path of root path for web")
 	flag.String("argo-address", "http://localhost", "service address for argoworkflow")

internal/delivery/http/stack.go

@@ -4,14 +4,12 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	"github.com/openinfradev/tks-api/internal/auth/request"
 	"github.com/openinfradev/tks-api/internal/usecase"
 	"github.com/openinfradev/tks-api/pkg/domain"
 	"github.com/openinfradev/tks-api/pkg/httpErrors"
 	"github.com/openinfradev/tks-api/pkg/log"
-	"github.com/pkg/errors"
 )
 
 type StackHandler struct {
@@ -47,16 +45,13 @@ func (h *StackHandler) CreateStack(w http.ResponseWriter, r *http.Request) {
 		log.Info(err)
 	}
 
-	stackId, err := h.usecase.Create(r.Context(), dto)
+	err = h.usecase.Create(r.Context(), dto)
 	if err != nil {
 		ErrorJSON(w, err)
 		return
 	}
 
-	var out domain.CreateStackResponse
-	out.ID = stackId.String()
-
-	ResponseJSON(w, http.StatusOK, out)
+	ResponseJSON(w, http.StatusOK, nil)
 }
 
 // GetStack godoc
@@ -65,7 +60,6 @@ func (h *StackHandler) CreateStack(w http.ResponseWriter, r *http.Request) {
 // @Description Get Stacks
 // @Accept json
 // @Produce json
-// @Param all query string false "show all organizations"
 // @Success 200 {object} domain.GetStacksResponse
 // @Router /stacks [get]
 // @Security     JWT
@@ -121,13 +115,7 @@ func (h *StackHandler) GetStack(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	stackId, err := uuid.Parse(strId)
-	if err != nil {
-		ErrorJSON(w, httpErrors.NewBadRequestError(errors.Wrap(err, "Failed to parse uuid %s")))
-		return
-	}
-
-	stack, err := h.usecase.Get(stackId)
+	stack, err := h.usecase.Get(domain.StackId(strId))
 	if err != nil {
 		ErrorJSON(w, err)
 		return
@@ -152,39 +140,7 @@ func (h *StackHandler) GetStack(w http.ResponseWriter, r *http.Request) {
 // @Router /stacks/{stackId} [put]
 // @Security     JWT
 func (h *StackHandler) UpdateStack(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	strId, ok := vars["stackId"]
-	if !ok {
-		ErrorJSON(w, httpErrors.NewBadRequestError(fmt.Errorf("Invalid stackId")))
-		return
-	}
-
-	cloudSeetingId, err := uuid.Parse(strId)
-	if err != nil {
-		ErrorJSON(w, httpErrors.NewBadRequestError(errors.Wrap(err, "Failed to parse uuid %s")))
-		return
-	}
-
-	input := domain.UpdateStackRequest{}
-	err = UnmarshalRequestInput(r, &input)
-	if err != nil {
-		ErrorJSON(w, httpErrors.NewBadRequestError(err))
-		return
-	}
-
-	var dto domain.Stack
-	if err = domain.Map(input, &dto); err != nil {
-		log.Info(err)
-	}
-	dto.ID = cloudSeetingId
-
-	err = h.usecase.Update(r.Context(), dto)
-	if err != nil {
-		ErrorJSON(w, err)
-		return
-	}
-
-	ResponseJSON(w, http.StatusOK, nil)
+	ErrorJSON(w, httpErrors.NewInternalServerError(fmt.Errorf("Need implementaion")))
 }
 
 // DeleteStack godoc
@@ -199,39 +155,7 @@ func (h *StackHandler) UpdateStack(w http.ResponseWriter, r *http.Request) {
 // @Router /stacks/{stackId} [delete]
 // @Security     JWT
 func (h *StackHandler) DeleteStack(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	stackId, ok := vars["stackId"]
-	if !ok {
-		ErrorJSON(w, httpErrors.NewBadRequestError(fmt.Errorf("Invalid stackId")))
-		return
-	}
-
-	parsedId, err := uuid.Parse(stackId)
-	if err != nil {
-		ErrorJSON(w, httpErrors.NewBadRequestError(errors.Wrap(err, "Failed to parse uuid")))
-		return
-	}
-
-	input := domain.DeleteStackRequest{}
-	err = UnmarshalRequestInput(r, &input)
-	if err != nil {
-		ErrorJSON(w, httpErrors.NewBadRequestError(err))
-		return
-	}
-
-	var dto domain.Stack
-	if err = domain.Map(input, &dto); err != nil {
-		log.Info(err)
-	}
-	dto.ID = parsedId
-
-	err = h.usecase.Delete(r.Context(), dto)
-	if err != nil {
-		ErrorJSON(w, err)
-		return
-	}
-
-	ResponseJSON(w, http.StatusOK, nil)
+	ErrorJSON(w, httpErrors.NewInternalServerError(fmt.Errorf("Need implementaion")))
 }
 
 // CheckStackName godoc
@@ -245,32 +169,6 @@ func (h *StackHandler) DeleteStack(w http.ResponseWriter, r *http.Request) {
 // @Router /stacks/name/{name}/existence [GET]
 // @Security     JWT
 func (h *StackHandler) CheckStackName(w http.ResponseWriter, r *http.Request) {
-	user, ok := request.UserFrom(r.Context())
-	if !ok {
-		ErrorJSON(w, httpErrors.NewBadRequestError(fmt.Errorf("Invalid token")))
-		return
-	}
+	ErrorJSON(w, httpErrors.NewInternalServerError(fmt.Errorf("Need implementaion")))
 
-	vars := mux.Vars(r)
-	name, ok := vars["name"]
-	if !ok {
-		ErrorJSON(w, httpErrors.NewBadRequestError(fmt.Errorf("Invalid name")))
-		return
-	}
-
-	exist := true
-	_, err := h.usecase.GetByName(user.GetOrganizationId(), name)
-	if err != nil {
-		if _, code := httpErrors.ErrorResponse(err); code == http.StatusNotFound {
-			exist = false
-		} else {
-			ErrorJSON(w, err)
-			return
-		}
-	}
-
-	var out domain.CheckStackNameResponse
-	out.Existed = exist
-
-	ResponseJSON(w, http.StatusOK, out)
 }

internal/repository/cloud-setting.go

@@ -132,16 +132,3 @@ func reflectCloudSetting(cloudSetting CloudSetting) domain.CloudSetting {
 		UpdatedAt:      cloudSetting.UpdatedAt,
 	}
 }
-
-func reflectUser(user User) domain.User {
-	return domain.User{
-		ID:          user.ID.String(),
-		AccountId:   user.AccountId,
-		Name:        user.Name,
-		Email:       user.Email,
-		Department:  user.Department,
-		Description: user.Description,
-		CreatedAt:   user.CreatedAt,
-		UpdatedAt:   user.UpdatedAt,
-	}
-}

internal/repository/repository.go

@@ -3,3 +3,14 @@ package repository
 import "gorm.io/gorm"
 
 type FilterFunc func(user *gorm.DB) *gorm.DB
+
+type Repository struct {
+	User          IUserRepository
+	Cluster       IClusterRepository
+	Organization  IOrganizationRepository
+	AppGroup      IAppGroupRepository
+	AppServeApp   IAppServeAppRepository
+	CloudSetting  ICloudSettingRepository
+	StackTemplate IStackTemplateRepository
+	History       IHistoryRepository
+}

internal/repository/user.go

@@ -434,3 +434,16 @@ func (r *UserRepository) reflectRole(role Role) domain.Role {
 		UpdatedAt:   role.UpdatedAt,
 	}
 }
+
+func reflectUser(user User) domain.User {
+	return domain.User{
+		ID:          user.ID.String(),
+		AccountId:   user.AccountId,
+		Name:        user.Name,
+		Email:       user.Email,
+		Department:  user.Department,
+		Description: user.Description,
+		CreatedAt:   user.CreatedAt,
+		UpdatedAt:   user.UpdatedAt,
+	}
+}