[fix] JPNICユーザ構造の修正

homenoc · Mar 16, 2021 · 27a5037 · 27a5037
1 parent 715ff5d
commit 27a5037
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/pkg/api/core/group/service/jpnicAdmin/v0/jpnicAdmin.go b/pkg/api/core/group/service/jpnicAdmin/v0/jpnicAdmin.go
@@ -60,8 +60,6 @@ func Add(c *gin.Context) {
 		AddressEn: input.AddressEn,
 		Dept:      input.Dept,
 		DeptEn:    input.DeptEn,
-		Pos:       input.Pos,
-		PosEn:     input.PosEn,
 		Tel:       input.Tel,
 		Fax:       input.Fax,
 		Country:   input.Country,

diff --git a/pkg/api/core/group/service/jpnicTech/v0/jpnicTech.go b/pkg/api/core/group/service/jpnicTech/v0/jpnicTech.go
@@ -59,8 +59,6 @@ func Add(c *gin.Context) {
 		AddressEn: input.AddressEn,
 		Dept:      input.Dept,
 		DeptEn:    input.DeptEn,
-		Pos:       input.Pos,
-		PosEn:     input.PosEn,
 		Tel:       input.Tel,
 		Fax:       input.Fax,
 		Country:   input.Country,

diff --git a/pkg/api/core/interface.go b/pkg/api/core/interface.go
@@ -179,17 +179,16 @@ type Plan struct {
 type JPNICAdmin struct {
 	gorm.Model
 	Service     []Service `gorm:"foreignkey:JPNICAdminID"`
-	GroupName   string    `json:"group_name"`
-	GroupNameEn string    `json:"group_name_en"`
+	JPNICHandle string    `json:"jpnic_handle"`
+	Name        string    `json:"name"`
+	NameEn      string    `json:"name_en"`
 	Org         string    `json:"org"`
 	OrgEn       string    `json:"org_en"`
 	PostCode    string    `json:"postcode"`
 	Address     string    `json:"address"`
 	AddressEn   string    `json:"address_en"`
 	Dept        string    `json:"dept"`
 	DeptEn      string    `json:"dept_en"`
-	Pos         string    `json:"pos"`
-	PosEn       string    `json:"pos_en"`
 	Tel         string    `json:"tel"`
 	Fax         string    `json:"fax"`
 	Country     string    `json:"country"`
@@ -199,17 +198,16 @@ type JPNICAdmin struct {
 type JPNICTech struct {
 	gorm.Model
 	Service     []Service `json:"service" gorm:"many2many:service_jpnic_tech;"`
-	GroupName   string    `json:"group_name"`
-	GroupNameEn string    `json:"group_name_en"`
+	JPNICHandle string    `json:"jpnic_handle"`
+	Name        string    `json:"name"`
+	NameEn      string    `json:"name_en"`
 	Org         string    `json:"org"`
 	OrgEn       string    `json:"org_en"`
 	PostCode    string    `json:"postcode"`
 	Address     string    `json:"address"`
 	AddressEn   string    `json:"address_en"`
 	Dept        string    `json:"dept"`
 	DeptEn      string    `json:"dept_en"`
-	Pos         string    `json:"pos"`
-	PosEn       string    `json:"pos_en"`
 	Tel         string    `json:"tel"`
 	Fax         string    `json:"fax"`
 	Country     string    `json:"country"`

diff --git a/pkg/api/store/group/service/jpnicAdmin/v0/jpnicAdmin.go b/pkg/api/store/group/service/jpnicAdmin/v0/jpnicAdmin.go
@@ -52,8 +52,6 @@ func Update(base int, u core.JPNICAdmin) error {
 			AddressEn: u.AddressEn,
 			Dept:      u.Dept,
 			DeptEn:    u.DeptEn,
-			Pos:       u.Pos,
-			PosEn:     u.PosEn,
 			Tel:       u.Tel,
 			Fax:       u.Fax,
 			Country:   u.Country,

diff --git a/pkg/api/store/group/service/jpnicTech/v0/jpnicTech.go b/pkg/api/store/group/service/jpnicTech/v0/jpnicTech.go
@@ -52,8 +52,6 @@ func Update(base int, u core.JPNICTech) error {
 			AddressEn: u.AddressEn,
 			Dept:      u.Dept,
 			DeptEn:    u.DeptEn,
-			Pos:       u.Pos,
-			PosEn:     u.PosEn,
 			Tel:       u.Tel,
 			Fax:       u.Fax,
 			Country:   u.Country,