Remove redundant struct definition

neticdk · Dec 4, 2024 · 9ab4bf4 · 9ab4bf4
1 parent 7b5d42d
commit 9ab4bf4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/pkg/tidydns/tidydns.go b/pkg/tidydns/tidydns.go
@@ -81,11 +81,11 @@ type UserInfo struct {
 }
 
 type UserInfoGroup struct {
-	GroupName   string
-	Name        string
-	Notes       *string
-	Id          int
-	Description *string
+	GroupName   string  `json:"groupname"`
+	Name        string  `json:"name"`
+	Notes       *string `json:"notes,omitempty"`
+	Id          int     `json:"id"`
+	Description *string `json:"description,omitempty"`
 }
 
 type UserID int

diff --git a/pkg/tidydns/types.go b/pkg/tidydns/types.go
@@ -63,22 +63,14 @@ type userCreate struct {
 }
 
 type userRead struct {
-	ModifiedBy        string      `json:"modified_by"`
-	Description       string      `json:"description"`
-	ModifiedDate      string      `json:"modified_date"`
-	Username          string      `json:"username"`
-	AuthGroup         string      `json:"auth_group"`
-	Name              string      `json:"name"`
-	Epassword         string      `json:"epassword"`
-	PasswdChangedDate string      `json:"passwd_changed_date"`
-	Id                int         `json:"id"`
-	Groups            []userGroup `json:"groups"`
-}
-
-type userGroup struct {
-	GroupName   string  `json:"groupname"`
-	Name        string  `json:"name"`
-	Notes       *string `json:"notes,omitempty"`
-	Id          int     `json:"id"`
-	Description *string `json:"description,omitempty"`
+	ModifiedBy        string          `json:"modified_by"`
+	Description       string          `json:"description"`
+	ModifiedDate      string          `json:"modified_date"`
+	Username          string          `json:"username"`
+	AuthGroup         string          `json:"auth_group"`
+	Name              string          `json:"name"`
+	Epassword         string          `json:"epassword"`
+	PasswdChangedDate string          `json:"passwd_changed_date"`
+	Id                int             `json:"id"`
+	Groups            []UserInfoGroup `json:"groups"`
 }