Merge pull request #255 from cho4036/dev-rbac-tks

bug fix: build error fix
openinfradev · Mar 4, 2024 · 1886eec · 1886eec
2 parents 18c44cc + 2d2880e
commit 1886eec
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/internal/delivery/http/auth.go b/internal/delivery/http/auth.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/google/uuid"
 	"github.com/openinfradev/tks-api/internal"
 	"github.com/openinfradev/tks-api/internal/middleware/audit"
 	"github.com/openinfradev/tks-api/internal/middleware/auth/request"
@@ -73,14 +72,13 @@ func (h *AuthHandler) Login(w http.ResponseWriter, r *http.Request) {
 		ErrorJSON(w, r, err)
 		return
 	} else {
-		userId, _ := uuid.Parse(user.ID)
 		_, _ = h.auditUsecase.Create(r.Context(), domain.Audit{
 			OrganizationId: input.OrganizationId,
 			Group:          "Auth",
 			Message:        fmt.Sprintf("[%s]님이 로그인 하였습니다.", input.AccountId),
 			Description:    "",
 			ClientIP:       audit.GetClientIpAddress(w, r),
-			UserId:         &userId,
+			UserId:         &user.ID,
 		})
 	}
 

diff --git a/internal/delivery/http/role.go b/internal/delivery/http/role.go
@@ -112,11 +112,7 @@ func (h RoleHandler) ListTksRoles(w http.ResponseWriter, r *http.Request) {
 
 	// query parameter
 	urlParams := r.URL.Query()
-	pg, err := pagination.NewPagination(&urlParams)
-	if err != nil {
-		ErrorJSON(w, r, httpErrors.NewBadRequestError(err, "", ""))
-		return
-	}
+	pg := pagination.NewPagination(&urlParams)
 
 	// list roles
 	roles, err := h.roleUsecase.ListTksRoles(organizationId, pg)

diff --git a/internal/repository/audit.go b/internal/repository/audit.go
@@ -37,13 +37,13 @@ type Audit struct {
 
 	ID             uuid.UUID `gorm:"primarykey"`
 	OrganizationId string
-	Organization   Organization `gorm:"foreignKey:OrganizationId"`
+	Organization   domain.Organization `gorm:"foreignKey:OrganizationId"`
 	Group          string
 	Message        string
 	Description    string
 	ClientIP       string
-	UserId         *uuid.UUID `gorm:"type:uuid"`
-	User           User       `gorm:"foreignKey:UserId"`
+	UserId         *uuid.UUID  `gorm:"type:uuid"`
+	User           domain.User `gorm:"foreignKey:UserId"`
 }
 
 func (c *Audit) BeforeCreate(tx *gorm.DB) (err error) {

diff --git a/internal/repository/endpoint.go b/internal/repository/endpoint.go
@@ -41,7 +41,7 @@ func (e *EndpointRepository) List(pg *pagination.Pagination) ([]*domain.Endpoint
 	var endpoints []*domain.Endpoint
 
 	if pg == nil {
-		pg = pagination.NewDefaultPagination()
+		pg = pagination.NewPagination(nil)
 	}
 	filterFunc := CombinedGormFilter("endpoints", pg.GetFilters(), pg.CombinedFilter)
 	db := filterFunc(e.db.Model(&domain.Endpoint{}))

diff --git a/internal/repository/role.go b/internal/repository/role.go
@@ -47,7 +47,7 @@ func (r RoleRepository) List(pg *pagination.Pagination) ([]*domain.Role, error)
 	var roles []*domain.Role
 
 	if pg == nil {
-		pg = pagination.NewDefaultPagination()
+		pg = pagination.NewPagination(nil)
 	}
 	filterFunc := CombinedGormFilter("roles", pg.GetFilters(), pg.CombinedFilter)
 	db := filterFunc(r.db.Model(&domain.Role{}))
@@ -69,7 +69,7 @@ func (r RoleRepository) ListTksRoles(organizationId string, pg *pagination.Pagin
 	var roles []*domain.Role
 
 	if pg == nil {
-		pg = pagination.NewDefaultPagination()
+		pg = pagination.NewPagination(nil)
 	}
 	filterFunc := CombinedGormFilter("roles", pg.GetFilters(), pg.CombinedFilter)
 	db := filterFunc(r.db.Model(&domain.Role{}))