resource as resource named

models/resources/datacenter/datacenter.go

@@ -7,7 +7,7 @@ import (
 	"cloud.o-forge.io/core/oc-lib/models/utils"
 )
 
-type Datacenter struct {
+type DatacenterResource struct {
 	resources.AbstractResource
 	Owner        string `bson:"owner" json:"owner" required:"true"`
 	BookingPrice int    `bson:"booking_price" json:"booking_price" required:"true"`
@@ -37,7 +37,7 @@ type DatacenterGpuModel struct {
 	TensorCores uint   `bson:"tensor_cores,omitempty" json:"tensor_cores,omitempty"`
 }
 
-func (dma *Datacenter) Deserialize(j map[string]interface{}) utils.DBObject {
+func (dma *DatacenterResource) Deserialize(j map[string]interface{}) utils.DBObject {
 	b, err := json.Marshal(j)
 	if err != nil {
 		return nil
@@ -46,7 +46,7 @@ func (dma *Datacenter) Deserialize(j map[string]interface{}) utils.DBObject {
 	return dma
 }
 
-func (dma *Datacenter) Serialize() map[string]interface{} {
+func (dma *DatacenterResource) Serialize() map[string]interface{} {
 	var m map[string]interface{}
 	b, err := json.Marshal(dma)
 	if err != nil {
@@ -56,12 +56,8 @@ func (dma *Datacenter) Serialize() map[string]interface{} {
 	return m
 }
 
-func (d *Datacenter) GetType() resources.ResourceType {
-	return resources.DATACENTER
-}
-
-func (d *Datacenter) GetAccessor() utils.Accessor {
+func (d *DatacenterResource) GetAccessor() utils.Accessor {
 	data := &DatacenterMongoAccessor{}
-	data.SetLogger(resources.DATACENTER)
+	data.SetLogger(utils.DATACENTER_RESOURCE)
 	return data
 }

models/resources/datacenter/datacenter_mongo_accessor.go

@@ -18,20 +18,11 @@ func (dca *DatacenterMongoAccessor) UpdateOne(set map[string]interface{}, id str
 }
 
 func (dca *DatacenterMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, error) {
-	err := utils.Validate.Struct(data)
-	if err != nil {
-		return nil, err
-	}
-	id, err := mongo.MONGOService.StoreOne(data.(*Datacenter), dca.GetType())
-	if err != nil {
-		dca.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())
-		return nil, err
-	}
-	return dca.LoadOne(id)
+	return dca.GenericStoreOne(data, dca)
 }
 
 func (dca *DatacenterMongoAccessor) LoadOne(id string) (utils.DBObject, error) {
-	var datacenter Datacenter
+	var datacenter DatacenterResource
 
 	res_mongo, err := mongo.MONGOService.LoadOne(id, dca.GetType())
 	if err != nil {

models/resources/datacenter/datacenter_test.go

@@ -4,20 +4,20 @@ import (
 	"testing"
 
 	resources "cloud.o-forge.io/core/oc-lib/models/resources"
+	"cloud.o-forge.io/core/oc-lib/models/utils"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestStoreOneDatacenter(t *testing.T) {
-	dc := Datacenter{Owner: "toto", BookingPrice: 123,
+	dc := DatacenterResource{Owner: "toto", BookingPrice: 123,
 		AbstractResource: resources.AbstractResource{
-			Uuid:        "123",
-			Name:        "testDatacenter",
-			Description: "Lorem Ipsum",
-			Logo:        "azerty.com",
-			Owner:       "toto",
-			OwnerLogo:   "totoLogo",
-			SourceUrl:   "azerty.fr",
+			AbstractObject: utils.AbstractObject{Name: "testDatacenter"},
+			Description:    "Lorem Ipsum",
+			Logo:           "azerty.com",
+			Owner:          "toto",
+			OwnerLogo:      "totoLogo",
+			SourceUrl:      "azerty.fr",
 		},
 	}
 
@@ -28,15 +28,14 @@ func TestStoreOneDatacenter(t *testing.T) {
 }
 
 func TestLoadOneDatacenter(t *testing.T) {
-	dc := Datacenter{Owner: "toto", BookingPrice: 123,
+	dc := DatacenterResource{Owner: "toto", BookingPrice: 123,
 		AbstractResource: resources.AbstractResource{
-			Uuid:        "123",
-			Name:        "testDatacenter",
-			Description: "Lorem Ipsum",
-			Logo:        "azerty.com",
-			Owner:       "toto",
-			OwnerLogo:   "totoLogo",
-			SourceUrl:   "azerty.fr",
+			AbstractObject: utils.AbstractObject{Name: "testDatacenter"},
+			Description:    "Lorem Ipsum",
+			Logo:           "azerty.com",
+			Owner:          "toto",
+			OwnerLogo:      "totoLogo",
+			SourceUrl:      "azerty.fr",
 		},
 	}