Skip to content
This repository was archived by the owner on May 11, 2022. It is now read-only.

Commit eacc5f7

Browse files
kamilskkamilsk
committed
fix #24: use go.octolab.org/pointer
1 parent 7eb7c2f commit eacc5f7

File tree

6 files changed

+498
-108
lines changed

6 files changed

+498
-108
lines changed

‎internal/server/v1/converter.go

+20-108
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package v1
22

33
import (
4+
"go.octolab.org/pointer"
5+
46
v1 "go.octolab.org/ecosystem/tablo/internal/generated/api/v1"
57
"go.octolab.org/ecosystem/tablo/internal/model"
68
)
@@ -12,18 +14,8 @@ func convertBoard(in *v1.Board) model.Board {
1214
out.ID = &id
1315

1416
out.Title = in.Title
15-
if in.Emoji != "" {
16-
17-
// TODO:debt use use go.octolab.org/pointer.ToString
18-
out.Emoji = (*model.Emoji)(&in.Emoji)
19-
20-
}
21-
if in.Description != "" {
22-
23-
// TODO:debt use use go.octolab.org/pointer.ToString
24-
out.Description = &in.Description
25-
26-
}
17+
out.Emoji = (*model.Emoji)(pointer.ToStringOrNil(in.Emoji))
18+
out.Description = pointer.ToStringOrNil(in.Description)
2719

2820
return out
2921
}
@@ -35,18 +27,8 @@ func convertCard(in *v1.Card) model.Card {
3527
out.ID = &id
3628

3729
out.Title = in.Title
38-
if in.Emoji != "" {
39-
40-
// TODO:debt use use go.octolab.org/pointer.ToString
41-
out.Emoji = (*model.Emoji)(&in.Emoji)
42-
43-
}
44-
if in.Description != "" {
45-
46-
// TODO:debt use use go.octolab.org/pointer.ToString
47-
out.Description = &in.Description
48-
49-
}
30+
out.Emoji = (*model.Emoji)(pointer.ToStringOrNil(in.Emoji))
31+
out.Description = pointer.ToStringOrNil(in.Description)
5032

5133
return out
5234
}
@@ -58,18 +40,8 @@ func convertColumn(in *v1.Column) model.Column {
5840
out.ID = &id
5941

6042
out.Title = in.Title
61-
if in.Emoji != "" {
62-
63-
// TODO:debt use use go.octolab.org/pointer.ToString
64-
out.Emoji = (*model.Emoji)(&in.Emoji)
65-
66-
}
67-
if in.Description != "" {
68-
69-
// TODO:debt use use go.octolab.org/pointer.ToString
70-
out.Description = &in.Description
71-
72-
}
43+
out.Emoji = (*model.Emoji)(pointer.ToStringOrNil(in.Emoji))
44+
out.Description = pointer.ToStringOrNil(in.Description)
7345

7446
return out
7547
}
@@ -85,18 +57,8 @@ func convertBatchBoard(in *v1.BatchRequest_Board) model.Board {
8557
}
8658

8759
out.Title = in.Title
88-
if in.Emoji != "" {
89-
90-
// TODO:debt use use go.octolab.org/pointer.ToString
91-
out.Emoji = (*model.Emoji)(&in.Emoji)
92-
93-
}
94-
if in.Description != "" {
95-
96-
// TODO:debt use use go.octolab.org/pointer.ToString
97-
out.Description = &in.Description
98-
99-
}
60+
out.Emoji = (*model.Emoji)(pointer.ToStringOrNil(in.Emoji))
61+
out.Description = pointer.ToStringOrNil(in.Description)
10062
if in.Columns != nil {
10163
columns := make([]model.Column, 0, len(in.Columns))
10264
for _, column := range in.Columns {
@@ -119,18 +81,8 @@ func convertBatchCard(in *v1.BatchRequest_Card) model.Card {
11981
}
12082

12183
out.Title = in.Title
122-
if in.Emoji != "" {
123-
124-
// TODO:debt use use go.octolab.org/pointer.ToString
125-
out.Emoji = (*model.Emoji)(&in.Emoji)
126-
127-
}
128-
if in.Description != "" {
129-
130-
// TODO:debt use use go.octolab.org/pointer.ToString
131-
out.Description = &in.Description
132-
133-
}
84+
out.Emoji = (*model.Emoji)(pointer.ToStringOrNil(in.Emoji))
85+
out.Description = pointer.ToStringOrNil(in.Description)
13486

13587
return out
13688
}
@@ -146,18 +98,8 @@ func convertBatchColumn(in *v1.BatchRequest_Column) model.Column {
14698
}
14799

148100
out.Title = in.Title
149-
if in.Emoji != "" {
150-
151-
// TODO:debt use use go.octolab.org/pointer.ToString
152-
out.Emoji = (*model.Emoji)(&in.Emoji)
153-
154-
}
155-
if in.Description != "" {
156-
157-
// TODO:debt use use go.octolab.org/pointer.ToString
158-
out.Description = &in.Description
159-
160-
}
101+
out.Emoji = (*model.Emoji)(pointer.ToStringOrNil(in.Emoji))
102+
out.Description = pointer.ToStringOrNil(in.Description)
161103
if in.Cards != nil {
162104
cards := make([]model.Card, 0, len(in.Cards))
163105
for _, card := range in.Cards {
@@ -180,18 +122,8 @@ func convertNewBoard(in *v1.NewBoard) model.Board {
180122
}
181123

182124
out.Title = in.Title
183-
if in.Emoji != "" {
184-
185-
// TODO:debt use use go.octolab.org/pointer.ToString
186-
out.Emoji = (*model.Emoji)(&in.Emoji)
187-
188-
}
189-
if in.Description != "" {
190-
191-
// TODO:debt use use go.octolab.org/pointer.ToString
192-
out.Description = &in.Description
193-
194-
}
125+
out.Emoji = (*model.Emoji)(pointer.ToStringOrNil(in.Emoji))
126+
out.Description = pointer.ToStringOrNil(in.Description)
195127

196128
return out
197129
}
@@ -211,18 +143,8 @@ func convertNewCard(in *v1.NewCard) model.Card {
211143
out.Column = &model.Column{ID: &columnID}
212144

213145
out.Title = in.Title
214-
if in.Emoji != "" {
215-
216-
// TODO:debt use use go.octolab.org/pointer.ToString
217-
out.Emoji = (*model.Emoji)(&in.Emoji)
218-
219-
}
220-
if in.Description != "" {
221-
222-
// TODO:debt use use go.octolab.org/pointer.ToString
223-
out.Description = &in.Description
224-
225-
}
146+
out.Emoji = (*model.Emoji)(pointer.ToStringOrNil(in.Emoji))
147+
out.Description = pointer.ToStringOrNil(in.Description)
226148

227149
return out
228150
}
@@ -242,18 +164,8 @@ func convertNewColumn(in *v1.NewColumn) model.Column {
242164
out.Board = &model.Board{ID: &boardID}
243165

244166
out.Title = in.Title
245-
if in.Emoji != "" {
246-
247-
// TODO:debt use use go.octolab.org/pointer.ToString
248-
out.Emoji = (*model.Emoji)(&in.Emoji)
249-
250-
}
251-
if in.Description != "" {
252-
253-
// TODO:debt use use go.octolab.org/pointer.ToString
254-
out.Description = &in.Description
255-
256-
}
167+
out.Emoji = (*model.Emoji)(pointer.ToStringOrNil(in.Emoji))
168+
out.Description = pointer.ToStringOrNil(in.Description)
257169

258170
return out
259171
}

‎vendor/go.octolab.org/pointer/doc.go

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/go.octolab.org/pointer/pointer.go

+69
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)