feat(dp): Use mutable installation params for mutable cbsd API (#12891)

Previously same models were used for both mutable and read API,
but users should only be able to edit certain fields (antenna gain).

Signed-off-by: Kuba Marciniszyn <kuba@freedomfi.com>

dp/cloud/go/services/dp/builders/builders.go

@@ -248,6 +248,7 @@ func NewCbsdProtoPayloadBuilder() *CbsdProtoPayloadBuilder {
 			DesiredState:      registered,
 			CbsdCategory:      catB,
 			SingleStepEnabled: false,
+			InstallationParam: &protos.InstallationParam{},
 		},
 	}
 }
@@ -441,7 +442,7 @@ type CbsdModelPayloadBuilder struct {
 
 func NewCbsdModelPayloadBuilder() *CbsdModelPayloadBuilder {
 	return &CbsdModelPayloadBuilder{Payload: &models.Cbsd{
-		Capabilities: &models.Capabilities{
+		Capabilities: models.Capabilities{
 			MaxPower:         to_pointer.Float(20),
 			MinPower:         to_pointer.Float(10),
 			NumberOfAntennas: 2,
@@ -496,7 +497,7 @@ type MutableCbsdModelBuilder struct {
 
 func NewMutableCbsdModelPayloadBuilder() *MutableCbsdModelBuilder {
 	return &MutableCbsdModelBuilder{Payload: &models.MutableCbsd{
-		Capabilities: &models.Capabilities{
+		Capabilities: models.Capabilities{
 			MaxPower:         to_pointer.Float(20),
 			MinPower:         to_pointer.Float(10),
 			NumberOfAntennas: 2,
@@ -530,22 +531,11 @@ func (b *MutableCbsdModelBuilder) WithFccId(id string) *MutableCbsdModelBuilder
 }
 
 func (b *MutableCbsdModelBuilder) WithEmptyInstallationParam() *MutableCbsdModelBuilder {
-	b.Payload.InstallationParam = &models.InstallationParam{}
-	return b
-}
-
-func (b *MutableCbsdModelBuilder) WithHeightType(heightType string) *MutableCbsdModelBuilder {
-	if b.Payload.InstallationParam == nil {
-		b.Payload.InstallationParam = &models.InstallationParam{}
-	}
-	b.Payload.InstallationParam.HeightType = to_pointer.String(heightType)
+	b.Payload.InstallationParam = models.MutableInstallationParam{}
 	return b
 }
 
 func (b *MutableCbsdModelBuilder) WithAntennaGain(gain float64) *MutableCbsdModelBuilder {
-	if b.Payload.InstallationParam == nil {
-		b.Payload.InstallationParam = &models.InstallationParam{}
-	}
 	b.Payload.InstallationParam.AntennaGain = to_pointer.Float(gain)
 	return b
 }
@@ -579,18 +569,6 @@ func (b *MutableCbsdModelBuilder) WithSingleStepEnabled(enabled *bool) *MutableC
 	return b
 }
 
-func (b *MutableCbsdModelBuilder) WithIndoorDeployment(indoor *bool) *MutableCbsdModelBuilder {
-	if b.Payload.InstallationParam == nil {
-		b.Payload.InstallationParam = &models.InstallationParam{}
-	}
-	if indoor == nil {
-		b.Payload.InstallationParam.IndoorDeployment = nil
-	} else {
-		b.Payload.InstallationParam.IndoorDeployment = to_pointer.Bool(*indoor)
-	}
-	return b
-}
-
 func (b *MutableCbsdModelBuilder) WithMinPower(power *float64) *MutableCbsdModelBuilder {
 	if power == nil {
 		b.Payload.Capabilities.MinPower = nil

dp/cloud/go/services/dp/obsidian/models/conversion.go

@@ -36,14 +36,16 @@ func CbsdToBackend(m *MutableCbsd) *protos.CbsdData {
 			BandwidthMhz:   m.FrequencyPreferences.BandwidthMhz,
 			FrequenciesMhz: m.FrequencyPreferences.FrequenciesMhz,
 		},
-		DesiredState:      m.DesiredState,
-		InstallationParam: getProtoInstallationParam(m.InstallationParam),
+		DesiredState: m.DesiredState,
+		InstallationParam: &protos.InstallationParam{
+			AntennaGain: to_pointer.FloatToDoubleValue(m.InstallationParam.AntennaGain),
+		},
 	}
 }
 
 func CbsdFromBackend(details *protos.CbsdDetails) *Cbsd {
 	return &Cbsd{
-		Capabilities: &Capabilities{
+		Capabilities: Capabilities{
 			MaxPower:         &details.Data.Capabilities.MaxPower,
 			MinPower:         &details.Data.Capabilities.MinPower,
 			NumberOfAntennas: details.Data.Capabilities.NumberOfAntennas,
@@ -63,7 +65,7 @@ func CbsdFromBackend(details *protos.CbsdDetails) *Cbsd {
 		UserID:            details.Data.UserId,
 		SingleStepEnabled: details.Data.SingleStepEnabled,
 		CbsdCategory:      details.Data.CbsdCategory,
-		InstallationParam: getModelInstallationParam(details.Data.GetInstallationParam()),
+		InstallationParam: getModelInstallationParam(details.Data.InstallationParam),
 	}
 }
 
@@ -88,11 +90,8 @@ func getGrant(grant *protos.GrantDetails) *Grant {
 	}
 }
 
-func getModelInstallationParam(params *protos.InstallationParam) *InstallationParam {
-	if params == nil {
-		return nil
-	}
-	return &InstallationParam{
+func getModelInstallationParam(params *protos.InstallationParam) InstallationParam {
+	return InstallationParam{
 		AntennaGain:      to_pointer.DoubleValueToFloat(params.AntennaGain),
 		Heightm:          to_pointer.DoubleValueToFloat(params.HeightM),
 		HeightType:       to_pointer.StringValueToString(params.HeightType),
@@ -102,20 +101,6 @@ func getModelInstallationParam(params *protos.InstallationParam) *InstallationPa
 	}
 }
 
-func getProtoInstallationParam(params *InstallationParam) *protos.InstallationParam {
-	if params == nil {
-		return nil
-	}
-	return &protos.InstallationParam{
-		AntennaGain:      to_pointer.FloatToDoubleValue(params.AntennaGain),
-		HeightM:          to_pointer.FloatToDoubleValue(params.Heightm),
-		HeightType:       to_pointer.StringToStringValue(params.HeightType),
-		IndoorDeployment: to_pointer.BoolToBoolValue(params.IndoorDeployment),
-		LatitudeDeg:      to_pointer.FloatToDoubleValue(params.LatitudeDeg),
-		LongitudeDeg:     to_pointer.FloatToDoubleValue(params.LongitudeDeg),
-	}
-}
-
 type LogInterface struct {
 	Body         string          `json:"log_message"`
 	FccID        string          `json:"fcc_id"`

dp/cloud/go/services/dp/obsidian/models/conversion_test.go

@@ -88,7 +88,7 @@ func TestCbsdFromBackendWithoutInstallationParam(t *testing.T) {
 	details := b.NewDetailedProtoCbsdBuilder(
 		b.NewCbsdProtoPayloadBuilder()).Details
 	data := models.CbsdFromBackend(details)
-	assert.Nil(t, data.InstallationParam)
+	assert.Empty(t, data.InstallationParam)
 }
 
 func TestCbsdFromBackendWithInstallationParam(t *testing.T) {