Skip to content

Commit 22a24fd

Browse files
HappyTetrahedronHappyTetrahedron
committed
Fix naming of salesOrder properties in status subresource
1 parent bece922 commit 22a24fd

File tree

7 files changed

+34
-34
lines changed

7 files changed

+34
-34
lines changed

‎apis/organization/v1/organization_types.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ var (
3535
BillingEntityRefKey = "organization.appuio.io/billing-entity-ref"
3636
// BillingEntityNameKey is the annotation key that stores the billing entity name
3737
BillingEntityNameKey = "status.organization.appuio.io/billing-entity-name"
38-
// SaleOrderIdKey is the annotation key that stores the sale order ID
39-
SaleOrderIdKey = "status.organization.appuio.io/sale-order-id"
40-
// SaleOrderNameKey is the annotation key that stores the sale order name
41-
SaleOrderNameKey = "status.organization.appuio.io/sale-order-name"
38+
// SalesOrderIdKey is the annotation key that stores the sale order ID
39+
SalesOrderIdKey = "status.organization.appuio.io/sales-order-id"
40+
// SalesOrderNameKey is the annotation key that stores the sale order name
41+
SalesOrderNameKey = "status.organization.appuio.io/sales-order-name"
4242
// StatusConditionsKey is the annotation key that stores the serialized status conditions
4343
StatusConditionsKey = "status.organization.appuio.io/conditions"
4444
)
@@ -55,8 +55,8 @@ func NewOrganizationFromNS(ns *corev1.Namespace) *Organization {
5555
billingEntityRef = ns.Annotations[BillingEntityRefKey]
5656
billingEntityName = ns.Annotations[BillingEntityNameKey]
5757
statusConditionsString = ns.Annotations[StatusConditionsKey]
58-
saleOrderId = ns.Annotations[SaleOrderIdKey]
59-
saleOrderName = ns.Annotations[SaleOrderNameKey]
58+
saleOrderId = ns.Annotations[SalesOrderIdKey]
59+
saleOrderName = ns.Annotations[SalesOrderNameKey]
6060
}
6161
var conditions []metav1.Condition
6262
err := json.Unmarshal([]byte(statusConditionsString), &conditions)
@@ -71,8 +71,8 @@ func NewOrganizationFromNS(ns *corev1.Namespace) *Organization {
7171
},
7272
Status: OrganizationStatus{
7373
BillingEntityName: billingEntityName,
74-
SaleOrderID: saleOrderId,
75-
SaleOrderName: saleOrderName,
74+
SalesOrderID: saleOrderId,
75+
SalesOrderName: saleOrderName,
7676
Conditions: conditions,
7777
},
7878
}
@@ -111,11 +111,11 @@ type OrganizationStatus struct {
111111
// BillingEntityName is the name of the billing entity
112112
BillingEntityName string `json:"billingEntityName,omitempty"`
113113

114-
// SaleOrderID is the ID of the sale order
115-
SaleOrderID string `json:"saleOrderId,omitempty"`
114+
// SalesOrderID is the ID of the sale order
115+
SalesOrderID string `json:"salesOrderId,omitempty"`
116116

117-
// SaleOrderName is the name of the sale order
118-
SaleOrderName string `json:"saleOrderName,omitempty"`
117+
// SalesOrderName is the name of the sale order
118+
SalesOrderName string `json:"salesOrderName,omitempty"`
119119

120120
// Conditions is a list of conditions for the invitation
121121
Conditions []metav1.Condition `json:"conditions,omitempty"`
@@ -201,11 +201,11 @@ func (o *Organization) ToNamespace() *corev1.Namespace {
201201
ns.Annotations[DisplayNameKey] = o.Spec.DisplayName
202202
ns.Annotations[BillingEntityRefKey] = o.Spec.BillingEntityRef
203203
ns.Annotations[BillingEntityNameKey] = o.Status.BillingEntityName
204-
if o.Status.SaleOrderID != "" {
205-
ns.Annotations[SaleOrderIdKey] = o.Status.SaleOrderID
204+
if o.Status.SalesOrderID != "" {
205+
ns.Annotations[SalesOrderIdKey] = o.Status.SalesOrderID
206206
}
207-
if o.Status.SaleOrderName != "" {
208-
ns.Annotations[SaleOrderNameKey] = o.Status.SaleOrderName
207+
if o.Status.SalesOrderName != "" {
208+
ns.Annotations[SalesOrderNameKey] = o.Status.SalesOrderName
209209
}
210210
if statusString != "" {
211211
ns.Annotations[StatusConditionsKey] = statusString

‎controllers/org_info_metric.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (o *OrgInfoMetric) Collect(ch chan<- prometheus.Metric) {
4747
prometheus.GaugeValue,
4848
1,
4949
org.Name,
50-
org.Status.SaleOrderName,
50+
org.Status.SalesOrderName,
5151
)
5252
}
5353
}

‎controllers/org_info_metric_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestOrgInfoMetric(t *testing.T) {
3535
BillingEntityRef: "be-234",
3636
},
3737
Status: orgv1.OrganizationStatus{
38-
SaleOrderName: "SO9999",
38+
SalesOrderName: "SO9999",
3939
},
4040
})
4141

‎controllers/sale_order_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ func (r *SaleOrderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
4646
return ctrl.Result{}, nil
4747
}
4848

49-
if org.Status.SaleOrderName != "" {
49+
if org.Status.SalesOrderName != "" {
5050
return ctrl.Result{}, nil
5151
}
5252

53-
if org.Status.SaleOrderID != "" {
53+
if org.Status.SalesOrderID != "" {
5454
// ID is present, but Name is not. Update name.
5555
soName, err := r.SaleOrderStorage.GetSaleOrderName(org)
5656
if err != nil {
@@ -67,7 +67,7 @@ func (r *SaleOrderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
6767
Type: organizationv1.ConditionSaleOrderNameUpdated,
6868
Status: metav1.ConditionTrue,
6969
})
70-
org.Status.SaleOrderName = soName
70+
org.Status.SalesOrderName = soName
7171
return ctrl.Result{}, r.Client.Status().Update(ctx, &org)
7272
}
7373

@@ -90,7 +90,7 @@ func (r *SaleOrderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
9090
Status: metav1.ConditionTrue,
9191
})
9292

93-
org.Status.SaleOrderID = fmt.Sprint(soId)
93+
org.Status.SalesOrderID = fmt.Sprint(soId)
9494
return ctrl.Result{}, r.Client.Status().Update(ctx, &org)
9595
}
9696

‎controllers/sale_order_controller_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func Test_SaleOrderReconciler_Reconcile_Create_Success(t *testing.T) {
5050

5151
require.NoError(t, err)
5252
require.NoError(t, c.Get(ctx, types.NamespacedName{Name: subject.Name}, &subject))
53-
require.Equal(t, "123", subject.Status.SaleOrderID)
53+
require.Equal(t, "123", subject.Status.SalesOrderID)
5454
cond := apimeta.FindStatusCondition(subject.Status.Conditions, organizationv1.ConditionSaleOrderCreated)
5555
require.Equal(t, metav1.ConditionTrue, cond.Status)
5656
}
@@ -68,7 +68,7 @@ func Test_SaleOrderReconciler_Reconcile_UpdateName_Success(t *testing.T) {
6868
BillingEntityRef: "be-0000",
6969
},
7070
Status: organizationv1.OrganizationStatus{
71-
SaleOrderID: "123",
71+
SalesOrderID: "123",
7272
},
7373
}
7474
c := prepareTest(t, &subject)
@@ -90,8 +90,8 @@ func Test_SaleOrderReconciler_Reconcile_UpdateName_Success(t *testing.T) {
9090

9191
require.NoError(t, err)
9292
require.NoError(t, c.Get(ctx, types.NamespacedName{Name: subject.Name}, &subject))
93-
require.Equal(t, "123", subject.Status.SaleOrderID)
94-
require.Equal(t, "SO123", subject.Status.SaleOrderName)
93+
require.Equal(t, "123", subject.Status.SalesOrderID)
94+
require.Equal(t, "SO123", subject.Status.SalesOrderName)
9595
cond := apimeta.FindStatusCondition(subject.Status.Conditions, organizationv1.ConditionSaleOrderNameUpdated)
9696
require.Equal(t, metav1.ConditionTrue, cond.Status)
9797
}
@@ -109,8 +109,8 @@ func Test_SaleOrderReconciler_Reconcile_NoAction_Success(t *testing.T) {
109109
BillingEntityRef: "be-0000",
110110
},
111111
Status: organizationv1.OrganizationStatus{
112-
SaleOrderID: "123",
113-
SaleOrderName: "SO123",
112+
SalesOrderID: "123",
113+
SalesOrderName: "SO123",
114114
},
115115
}
116116
c := prepareTest(t, &subject)
@@ -268,8 +268,8 @@ func Test_SaleOrderReconciler_Create_StatusConditionCleared(t *testing.T) {
268268
cond = apimeta.FindStatusCondition(subject.Status.Conditions, organizationv1.ConditionSaleOrderNameUpdated)
269269
require.Equal(t, metav1.ConditionTrue, cond.Status)
270270
require.Equal(t, "", cond.Reason)
271-
require.Equal(t, "456", subject.Status.SaleOrderID)
272-
require.Equal(t, "ST456", subject.Status.SaleOrderName)
271+
require.Equal(t, "456", subject.Status.SalesOrderID)
272+
require.Equal(t, "ST456", subject.Status.SalesOrderName)
273273
}
274274

275275
func Test_SaleOrderReconciler_UpdateName_Error(t *testing.T) {
@@ -285,7 +285,7 @@ func Test_SaleOrderReconciler_UpdateName_Error(t *testing.T) {
285285
BillingEntityRef: "be-0000",
286286
},
287287
Status: organizationv1.OrganizationStatus{
288-
SaleOrderID: "123",
288+
SalesOrderID: "123",
289289
},
290290
}
291291
c := prepareTest(t, &subject)

‎controllers/saleorder/saleorder_storage.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ func (s *Odoo16SaleOrderStorage) GetSaleOrderName(org organizationv1.Organizatio
125125
"id",
126126
"name",
127127
)
128-
id, err := strconv.Atoi(org.Status.SaleOrderID)
128+
id, err := strconv.Atoi(org.Status.SalesOrderID)
129129
if err != nil {
130-
return "", fmt.Errorf("error parsing saleOrderID %q from organization status: %w", org.Status.SaleOrderID, err)
130+
return "", fmt.Errorf("error parsing saleOrderID %q from organization status: %w", org.Status.SalesOrderID, err)
131131
}
132132
soRecords := []odooclient.SaleOrder{}
133133
err = s.client.Read(odooclient.SaleOrderModel, []int64{int64(id)}, fetchOrderFieldOpts, &soRecords)

‎controllers/saleorder/saleorder_storage_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func TestGet(t *testing.T) {
9797
BillingEntityRef: "be-123",
9898
},
9999
Status: organizationv1.OrganizationStatus{
100-
SaleOrderID: "149",
100+
SalesOrderID: "149",
101101
},
102102
})
103103
require.NoError(t, err)

0 commit comments

Comments
 (0)