netbird/management-refactor
0
0
Fork 0
mirror of https://github.com/netbirdio/management-refactor.git synced 2026-05-22 17:12:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

update template module

Browse Source
This commit is contained in:
Pascal Fischer
2025-06-12 20:36:13 +02:00
parent ab2ce57d55
commit fdd59c7596
10 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internals/modules/template/interface.go → internals/modules/templates/interface.go
+1 -1
View File
@@ -1,4 +1,4 @@
package template
package templates
import (
"context"
internals/modules/template/manager/api.go → internals/modules/templates/manager/api.go
+5 -7
View File
@@ -5,11 +5,9 @@ import (
"net/http"
"github.com/gorilla/mux"
"github.com/netbirdio/management-refactor/integrations/shared/api"
nbcontext "github.com/netbirdio/netbird/management/server/context"
"github.com/netbirdio/management-refactor/internals/modules/template"
"github.com/netbirdio/management-refactor/internals/modules/users"
"github.com/netbirdio/management-refactor/internals/modules/templates"
"github.com/netbirdio/management-refactor/internals/shared/db"
"github.com/netbirdio/management-refactor/internals/shared/permissions"
"github.com/netbirdio/management-refactor/internals/shared/permissions/modules"
@@ -17,10 +15,10 @@ import (
)
type handler struct {
manager template.Manager
manager templates.Manager
}
func RegisterEndpoints(router *mux.Router, permissionsManager permissions.Manager, manager template.Manager) {
func RegisterEndpoints(router *mux.Router, permissionsManager permissions.Manager, manager templates.Manager) {
h := &handler{
manager: manager,
}
@@ -60,7 +58,7 @@ func (h *handler) createTemplate(w http.ResponseWriter, r *http.Request, userAut
return
}
templateObj := &template.Template{}
templateObj := &templates.Template{}
templateObj.FromAPIRequest(templateReq)
err := templateObj.Validate()
@@ -89,7 +87,7 @@ func (h *handler) updateTemplate(w http.ResponseWriter, r *http.Request, userAut
return
}
templateObj := &template.Template{}
templateObj := &templates.Template{}
templateObj.FromAPIRequest(templateReq)
templateObj.Id = templateId
internals/modules/template/manager/api_test.go → internals/modules/templates/manager/api_test.go
View File
internals/modules/template/manager/manager.go → internals/modules/templates/manager/manager.go
+7 -7
View File
@@ -5,11 +5,11 @@ package manager
import (
"context"
"github.com/netbirdio/management-refactor/internals/modules/template"
"github.com/netbirdio/management-refactor/internals/modules/templates"
"github.com/netbirdio/management-refactor/internals/shared/db"
)
var _ template.Manager = (*Manager)(nil)
var _ templates.Manager = (*Manager)(nil)
type Manager struct {
repo Repository
@@ -19,23 +19,23 @@ func NewManager(repo Repository) *Manager {
return &Manager{repo: repo}
}
func (m *Manager) CreateTemplate(ctx context.Context, tx db.Transaction, template *template.Template) (*template.Template, error) {
func (m *Manager) CreateTemplate(ctx context.Context, tx db.Transaction, template *templates.Template) (*templates.Template, error) {
return m.repo.CreateTemplate(ctx, tx, template)
}
func (m *Manager) GetAllTemplates(ctx context.Context, tx db.Transaction, strength db.LockingStrength, accountID string) ([]*template.Template, error) {
func (m *Manager) GetAllTemplates(ctx context.Context, tx db.Transaction, strength db.LockingStrength, accountID string) ([]*templates.Template, error) {
return m.repo.GetAllTemplates(ctx, tx, strength, accountID)
}
func (m *Manager) GetTemplateByID(ctx context.Context, tx db.Transaction, strength db.LockingStrength, id string) (*template.Template, error) {
func (m *Manager) GetTemplateByID(ctx context.Context, tx db.Transaction, strength db.LockingStrength, id string) (*templates.Template, error) {
return m.repo.GetTemplateByID(ctx, tx, strength, id)
}
func (m *Manager) UpdateTemplate(ctx context.Context, tx db.Transaction, template *template.Template) (*template.Template, error) {
func (m *Manager) UpdateTemplate(ctx context.Context, tx db.Transaction, template *templates.Template) (*templates.Template, error) {
return m.repo.UpdateTemplate(ctx, tx, template)
}
func (m *Manager) DeleteTemplate(ctx context.Context, tx db.Transaction, id string) error {
template := &template.Template{Id: id}
template := &templates.Template{Id: id}
return m.repo.DeleteTemplate(ctx, tx, template)
}
internals/modules/template/manager/manager_mock.go → internals/modules/templates/manager/manager_mock.go
+9 -9
View File
@@ -9,7 +9,7 @@ import (
reflect "reflect"
gomock "github.com/golang/mock/gomock"
template "github.com/netbirdio/management-refactor/internals/modules/template"
templates "github.com/netbirdio/management-refactor/internals/modules/templates"
db "github.com/netbirdio/management-refactor/internals/shared/db"
)
@@ -37,10 +37,10 @@ func (m *MockManager) EXPECT() *MockManagerMockRecorder {
}
// CreateTemplate mocks base method.
func (m *MockManager) CreateTemplate(ctx context.Context, tx db.Transaction, template *template.Template) (*template.Template, error) {
func (m *MockManager) CreateTemplate(ctx context.Context, tx db.Transaction, template *templates.Template) (*templates.Template, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "CreateTemplate", ctx, tx, template)
ret0, _ := ret[0].(*template.Template)
ret0, _ := ret[0].(*templates.Template)
ret1, _ := ret[1].(error)
return ret0, ret1
}
@@ -66,10 +66,10 @@ func (mr *MockManagerMockRecorder) DeleteTemplate(ctx, tx, id interface{}) *gomo
}
// GetAllTemplates mocks base method.
func (m *MockManager) GetAllTemplates(ctx context.Context, tx db.Transaction, strength db.LockingStrength, accountID string) ([]*template.Template, error) {
func (m *MockManager) GetAllTemplates(ctx context.Context, tx db.Transaction, strength db.LockingStrength, accountID string) ([]*templates.Template, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "GetAllTemplates", ctx, tx, strength, accountID)
ret0, _ := ret[0].([]*template.Template)
ret0, _ := ret[0].([]*templates.Template)
ret1, _ := ret[1].(error)
return ret0, ret1
}
@@ -81,10 +81,10 @@ func (mr *MockManagerMockRecorder) GetAllTemplates(ctx, tx, strength, accountID
}
// GetTemplateByID mocks base method.
func (m *MockManager) GetTemplateByID(ctx context.Context, tx db.Transaction, strength db.LockingStrength, id string) (*template.Template, error) {
func (m *MockManager) GetTemplateByID(ctx context.Context, tx db.Transaction, strength db.LockingStrength, id string) (*templates.Template, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "GetTemplateByID", ctx, tx, strength, id)
ret0, _ := ret[0].(*template.Template)
ret0, _ := ret[0].(*templates.Template)
ret1, _ := ret[1].(error)
return ret0, ret1
}
@@ -96,10 +96,10 @@ func (mr *MockManagerMockRecorder) GetTemplateByID(ctx, tx, strength, id interfa
}
// UpdateTemplate mocks base method.
func (m *MockManager) UpdateTemplate(ctx context.Context, tx db.Transaction, template *template.Template) (*template.Template, error) {
func (m *MockManager) UpdateTemplate(ctx context.Context, tx db.Transaction, template *templates.Template) (*templates.Template, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "UpdateTemplate", ctx, tx, template)
ret0, _ := ret[0].(*template.Template)
ret0, _ := ret[0].(*templates.Template)
ret1, _ := ret[1].(error)
return ret0, ret1
}
internals/modules/template/manager/manager_test.go → internals/modules/templates/manager/manager_test.go
View File
internals/modules/template/manager/repository.go → internals/modules/templates/manager/repository.go
+12 -12
View File
@@ -7,7 +7,7 @@ import (
log "github.com/sirupsen/logrus"
"github.com/netbirdio/management-refactor/internals/modules/template"
"github.com/netbirdio/management-refactor/internals/modules/templates"
"github.com/netbirdio/management-refactor/internals/shared/db"
)
@@ -15,11 +15,11 @@ var _ Repository = (*repository)(nil)
type Repository interface {
RunInTx(fn func(tx db.Transaction) error) error
CreateTemplate(ctx context.Context, tx db.Transaction, template *template.Template) (*template.Template, error)
GetAllTemplates(ctx context.Context, tx db.Transaction, strength db.LockingStrength, accountId string) ([]*template.Template, error)
GetTemplateByID(ctx context.Context, tx db.Transaction, strength db.LockingStrength, id string) (*template.Template, error)
UpdateTemplate(ctx context.Context, tx db.Transaction, template *template.Template) (*template.Template, error)
DeleteTemplate(ctx context.Context, tx db.Transaction, template *template.Template) error
CreateTemplate(ctx context.Context, tx db.Transaction, template *templates.Template) (*templates.Template, error)
GetAllTemplates(ctx context.Context, tx db.Transaction, strength db.LockingStrength, accountId string) ([]*templates.Template, error)
GetTemplateByID(ctx context.Context, tx db.Transaction, strength db.LockingStrength, id string) (*templates.Template, error)
UpdateTemplate(ctx context.Context, tx db.Transaction, template *templates.Template) (*templates.Template, error)
DeleteTemplate(ctx context.Context, tx db.Transaction, template *templates.Template) error
}
type repository struct {
@@ -27,7 +27,7 @@ type repository struct {
}
func NewRepository(s *db.Store) Repository {
err := s.AutoMigrate(template.Template{})
err := s.AutoMigrate(templates.Template{})
if err != nil {
log.Fatalf("Failed to auto migrate: %v", err)
}
@@ -38,24 +38,24 @@ func (r *repository) RunInTx(fn func(tx db.Transaction) error) error {
return r.store.RunInTx(fn)
}
func (r *repository) CreateTemplate(ctx context.Context, tx db.Transaction, template *template.Template) (*template.Template, error) {
func (r *repository) CreateTemplate(ctx context.Context, tx db.Transaction, template *templates.Template) (*templates.Template, error) {
return template, r.store.Create(tx, template)
}
func (r *repository) GetAllTemplates(ctx context.Context, tx db.Transaction, strength db.LockingStrength, accountId string) (templates []*template.Template, err error) {
func (r *repository) GetAllTemplates(ctx context.Context, tx db.Transaction, strength db.LockingStrength, accountId string) (templates []*templates.Template, err error) {
err = r.store.GetMany(tx, strength, templates, "account_id = ?", accountId)
return
}
func (r *repository) GetTemplateByID(ctx context.Context, tx db.Transaction, strength db.LockingStrength, id string) (template *template.Template, err error) {
func (r *repository) GetTemplateByID(ctx context.Context, tx db.Transaction, strength db.LockingStrength, id string) (template *templates.Template, err error) {
err = r.store.GetOne(tx, strength, &template, "id = ?", id)
return
}
func (r *repository) UpdateTemplate(ctx context.Context, tx db.Transaction, template *template.Template) (*template.Template, error) {
func (r *repository) UpdateTemplate(ctx context.Context, tx db.Transaction, template *templates.Template) (*templates.Template, error) {
return template, r.store.Update(tx, template)
}
func (r *repository) DeleteTemplate(ctx context.Context, tx db.Transaction, template *template.Template) error {
func (r *repository) DeleteTemplate(ctx context.Context, tx db.Transaction, template *templates.Template) error {
return r.store.Delete(tx, template)
}
internals/modules/template/manager/repository_mock.go → internals/modules/templates/manager/repository_mock.go
+10 -10
View File
@@ -9,7 +9,7 @@ import (
reflect "reflect"
gomock "github.com/golang/mock/gomock"
template "github.com/netbirdio/management-refactor/internals/modules/template"
templates "github.com/netbirdio/management-refactor/internals/modules/templates"
db "github.com/netbirdio/management-refactor/internals/shared/db"
)
@@ -37,10 +37,10 @@ func (m *MockRepository) EXPECT() *MockRepositoryMockRecorder {
}
// CreateTemplate mocks base method.
func (m *MockRepository) CreateTemplate(ctx context.Context, tx db.Transaction, template *template.Template) (*template.Template, error) {
func (m *MockRepository) CreateTemplate(ctx context.Context, tx db.Transaction, template *templates.Template) (*templates.Template, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "CreateTemplate", ctx, tx, template)
ret0, _ := ret[0].(*template.Template)
ret0, _ := ret[0].(*templates.Template)
ret1, _ := ret[1].(error)
return ret0, ret1
}
@@ -52,7 +52,7 @@ func (mr *MockRepositoryMockRecorder) CreateTemplate(ctx, tx, template interface
}
// DeleteTemplate mocks base method.
func (m *MockRepository) DeleteTemplate(ctx context.Context, tx db.Transaction, template *template.Template) error {
func (m *MockRepository) DeleteTemplate(ctx context.Context, tx db.Transaction, template *templates.Template) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "DeleteTemplate", ctx, tx, template)
ret0, _ := ret[0].(error)
@@ -66,10 +66,10 @@ func (mr *MockRepositoryMockRecorder) DeleteTemplate(ctx, tx, template interface
}
// GetAllTemplates mocks base method.
func (m *MockRepository) GetAllTemplates(ctx context.Context, tx db.Transaction, strength db.LockingStrength, accountId string) ([]*template.Template, error) {
func (m *MockRepository) GetAllTemplates(ctx context.Context, tx db.Transaction, strength db.LockingStrength, accountId string) ([]*templates.Template, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "GetAllTemplates", ctx, tx, strength, accountId)
ret0, _ := ret[0].([]*template.Template)
ret0, _ := ret[0].([]*templates.Template)
ret1, _ := ret[1].(error)
return ret0, ret1
}
@@ -81,10 +81,10 @@ func (mr *MockRepositoryMockRecorder) GetAllTemplates(ctx, tx, strength, account
}
// GetTemplateByID mocks base method.
func (m *MockRepository) GetTemplateByID(ctx context.Context, tx db.Transaction, strength db.LockingStrength, id string) (*template.Template, error) {
func (m *MockRepository) GetTemplateByID(ctx context.Context, tx db.Transaction, strength db.LockingStrength, id string) (*templates.Template, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "GetTemplateByID", ctx, tx, strength, id)
ret0, _ := ret[0].(*template.Template)
ret0, _ := ret[0].(*templates.Template)
ret1, _ := ret[1].(error)
return ret0, ret1
}
@@ -110,10 +110,10 @@ func (mr *MockRepositoryMockRecorder) RunInTx(fn interface{}) *gomock.Call {
}
// UpdateTemplate mocks base method.
func (m *MockRepository) UpdateTemplate(ctx context.Context, tx db.Transaction, template *template.Template) (*template.Template, error) {
func (m *MockRepository) UpdateTemplate(ctx context.Context, tx db.Transaction, template *templates.Template) (*templates.Template, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "UpdateTemplate", ctx, tx, template)
ret0, _ := ret[0].(*template.Template)
ret0, _ := ret[0].(*templates.Template)
ret1, _ := ret[1].(error)
return ret0, ret1
}
internals/modules/template/manager/repository_test.go → internals/modules/templates/manager/repository_test.go
View File
internals/modules/template/type.go → internals/modules/templates/type.go
+1 -1
View File
@@ -1,4 +1,4 @@
package template
package templates
import (
"github.com/netbirdio/netbird/management/server/http/api"