Skip to content

Commit 41cdfff

Browse files
bl00mberbl00mber
committed
lint
1 parent ce65597 commit 41cdfff

File tree

6 files changed

+75
-73
lines changed

6 files changed

+75
-73
lines changed

‎models/issues/milestone.go

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,6 @@ func GetMilestoneByRepoID(ctx context.Context, repoID, id int64) (*Milestone, er
168168
if err != nil {
169169
return nil, err
170170
}
171-
if m.Repo == nil {
172-
m.Repo, err = repo_model.GetRepositoryByID(repoID)
173-
if err != nil {
174-
return nil, err
175-
}
176-
}
177171
return m, nil
178172
}
179173

@@ -193,12 +187,6 @@ func GetMilestoneByRepoIDANDName(repoID int64, name string) (*Milestone, error)
193187
if err != nil {
194188
return nil, err
195189
}
196-
if m.Repo == nil {
197-
m.Repo, err = repo_model.GetRepositoryByID(repoID)
198-
if err != nil {
199-
return nil, err
200-
}
201-
}
202190
return &m, nil
203191
}
204192

@@ -239,7 +227,7 @@ func UpdateMilestone(m *Milestone, oldIsClosed bool) error {
239227
break
240228
}
241229
}
242-
if labelOnMilestone == false {
230+
if !labelOnMilestone {
243231
if err = deleteMilestoneLabel(ctx, m, dbLabel, nil); err != nil {
244232
return fmt.Errorf("deleteMilestoneLabel [id: %d]: %v", dbLabel.ID, err)
245233
}
@@ -254,7 +242,7 @@ func UpdateMilestone(m *Milestone, oldIsClosed bool) error {
254242
break
255243
}
256244
}
257-
if labelInDatabase == false {
245+
if !labelInDatabase {
258246
if err = m.addLabel(ctx, msLabel, nil); err != nil {
259247
return fmt.Errorf("addLabel [id: %d]: %v", msLabel.ID, err)
260248
}
@@ -429,6 +417,7 @@ func (milestones MilestoneList) getMilestoneIDs() []int64 {
429417
type GetMilestonesOption struct {
430418
db.ListOptions
431419
RepoID int64
420+
Repo *repo_model.Repository
432421
State api.StateType
433422
Name string
434423
SortType string
@@ -489,6 +478,9 @@ func GetMilestones(opts GetMilestonesOption) (MilestoneList, int64, error) {
489478
var labels []*Label
490479
labels, err = GetLabelsByMilestoneID(m.ID)
491480
m.Labels = labels
481+
if opts.Repo != nil {
482+
m.Repo = opts.Repo
483+
}
492484
}
493485

494486
return miles, total, err

‎models/issues/milestone_label.go

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ func GetLabelsByMilestoneID(milestoneID int64) ([]*Label, error) {
5050

5151
// newMilestoneLabel this function creates a new label it does not check if the label is valid for the milestone
5252
// YOU MUST CHECK THIS BEFORE THIS FUNCTION
53-
func newMilestoneLabel(ctx context.Context, milestone *Milestone, label *Label, doer *user_model.User) (err error) {
53+
func newMilestoneLabel(ctx context.Context, m *Milestone, label *Label, doer *user_model.User) (err error) {
5454
if err = db.Insert(ctx, &MilestoneLabel{
55-
MilestoneID: milestone.ID,
55+
MilestoneID: m.ID,
5656
LabelID: label.ID,
5757
}); err != nil {
5858
return err
@@ -62,8 +62,8 @@ func newMilestoneLabel(ctx context.Context, milestone *Milestone, label *Label,
6262
}
6363

6464
// NewMilestoneLabel creates a new milestone-label relation.
65-
func NewMilestoneLabel(milestone *Milestone, label *Label, doer *user_model.User) (err error) {
66-
if HasMilestoneLabel(milestone.ID, label.ID) {
65+
func NewMilestoneLabel(m *Milestone, label *Label, doer *user_model.User) (err error) {
66+
if HasMilestoneLabel(m.ID, label.ID) {
6767
return nil
6868
}
6969

@@ -76,32 +76,32 @@ func NewMilestoneLabel(milestone *Milestone, label *Label, doer *user_model.User
7676
sess := db.GetEngine(ctx)
7777

7878
// Do NOT add invalid labels
79-
if milestone.RepoID != label.RepoID && milestone.Repo.OwnerID != label.OrgID {
79+
if m.RepoID != label.RepoID && m.Repo.OwnerID != label.OrgID {
8080
return nil
8181
}
8282

83-
if err = newMilestoneLabel(ctx, milestone, label, doer); err != nil {
83+
if err = newMilestoneLabel(ctx, m, label, doer); err != nil {
8484
return err
8585
}
8686

87-
milestone.Labels = nil
88-
if err = milestone.loadLabels(sess); err != nil {
87+
m.Labels = nil
88+
if err = m.loadLabels(sess); err != nil {
8989
return err
9090
}
9191

9292
return committer.Commit()
9393
}
9494

9595
// newMilestoneLabels add labels to an milestone. It will check if the labels are valid for the milestone
96-
func newMilestoneLabels(ctx context.Context, e db.Engine, milestone *Milestone, labels []*Label, doer *user_model.User) (err error) {
96+
func newMilestoneLabels(ctx context.Context, e db.Engine, m *Milestone, labels []*Label, doer *user_model.User) (err error) {
9797
for _, label := range labels {
9898
// Don't add already present labels and invalid labels
99-
if hasMilestoneLabel(e, milestone.ID, label.ID) ||
100-
(label.RepoID != milestone.RepoID && label.OrgID != milestone.Repo.OwnerID) {
99+
if hasMilestoneLabel(e, m.ID, label.ID) ||
100+
(label.RepoID != m.RepoID && label.OrgID != m.Repo.OwnerID) {
101101
continue
102102
}
103103

104-
if err = newMilestoneLabel(ctx, milestone, label, doer); err != nil {
104+
if err = newMilestoneLabel(ctx, m, label, doer); err != nil {
105105
return fmt.Errorf("newMilestoneLabel: %v", err)
106106
}
107107
}
@@ -110,29 +110,29 @@ func newMilestoneLabels(ctx context.Context, e db.Engine, milestone *Milestone,
110110
}
111111

112112
// NewMilestoneLabels creates a list of milestone-label relations.
113-
func NewMilestoneLabels(milestone *Milestone, labels []*Label, doer *user_model.User) (err error) {
113+
func NewMilestoneLabels(m *Milestone, labels []*Label, doer *user_model.User) (err error) {
114114
ctx, committer, err := db.TxContext()
115115
if err != nil {
116116
return err
117117
}
118118
defer committer.Close()
119119

120-
if err = newMilestoneLabels(ctx, db.GetEngine(ctx), milestone, labels, doer); err != nil {
120+
if err = newMilestoneLabels(ctx, db.GetEngine(ctx), m, labels, doer); err != nil {
121121
return err
122122
}
123123

124-
milestone.Labels = nil
125-
if err = milestone.loadLabels(db.GetEngine(ctx)); err != nil {
124+
m.Labels = nil
125+
if err = m.loadLabels(db.GetEngine(ctx)); err != nil {
126126
return err
127127
}
128128

129129
return committer.Commit()
130130
}
131131

132-
func deleteMilestoneLabel(ctx context.Context, milestone *Milestone, label *Label, doer *user_model.User) (err error) {
132+
func deleteMilestoneLabel(ctx context.Context, m *Milestone, label *Label, doer *user_model.User) (err error) {
133133
// if count, err := db.DeleteByBean(ctx, &MilestoneLabel{
134134
if count, err := db.DeleteByBean(ctx, &MilestoneLabel{
135-
MilestoneID: milestone.ID,
135+
MilestoneID: m.ID,
136136
LabelID: label.ID,
137137
}); err != nil {
138138
return err
@@ -143,68 +143,68 @@ func deleteMilestoneLabel(ctx context.Context, milestone *Milestone, label *Labe
143143
}
144144

145145
// DeleteMilestoneLabel deletes milestone-label relation.
146-
func DeleteMilestoneLabel(milestone *Milestone, label *Label, doer *user_model.User) (err error) {
146+
func DeleteMilestoneLabel(m *Milestone, label *Label, doer *user_model.User) (err error) {
147147
ctx, committer, err := db.TxContext()
148148
if err != nil {
149149
return err
150150
}
151151
defer committer.Close()
152152

153-
if err = deleteMilestoneLabel(ctx, milestone, label, doer); err != nil {
153+
if err = deleteMilestoneLabel(ctx, m, label, doer); err != nil {
154154
return err
155155
}
156156

157157
return committer.Commit()
158158
}
159159

160160
// LoadLabels loads labels
161-
func (milestone *Milestone) LoadLabels() error {
162-
return milestone.loadLabels(db.GetEngine(db.DefaultContext))
161+
func (m *Milestone) LoadLabels() error {
162+
return m.loadLabels(db.GetEngine(db.DefaultContext))
163163
}
164164

165-
func (milestone *Milestone) loadLabels(e db.Engine) (err error) {
166-
if milestone.Labels == nil {
167-
milestone.Labels, err = getLabelsByMilestoneID(e, milestone.ID)
165+
func (m *Milestone) loadLabels(e db.Engine) (err error) {
166+
if m.Labels == nil {
167+
m.Labels, err = getLabelsByMilestoneID(e, m.ID)
168168
if err != nil {
169-
return fmt.Errorf("getLabelsByMilestoneID [%d]: %v", milestone.ID, err)
169+
return fmt.Errorf("getLabelsByMilestoneID [%d]: %v", m.ID, err)
170170
}
171171
}
172172
return nil
173173
}
174174

175-
func (milestone *Milestone) hasLabel(e db.Engine, labelID int64) bool {
176-
return hasMilestoneLabel(e, milestone.ID, labelID)
175+
func (m *Milestone) hasLabel(e db.Engine, labelID int64) bool {
176+
return hasMilestoneLabel(e, m.ID, labelID)
177177
}
178178

179179
// HasLabel returns true if milestone has been labeled by given ID.
180-
func (milestone *Milestone) HasLabel(labelID int64) bool {
181-
return milestone.hasLabel(db.GetEngine(db.DefaultContext), labelID)
180+
func (m *Milestone) HasLabel(labelID int64) bool {
181+
return m.hasLabel(db.GetEngine(db.DefaultContext), labelID)
182182
}
183183

184-
func (milestone *Milestone) addLabel(ctx context.Context, label *Label, doer *user_model.User) error {
185-
return newMilestoneLabel(ctx, milestone, label, doer)
184+
func (m *Milestone) addLabel(ctx context.Context, label *Label, doer *user_model.User) error {
185+
return newMilestoneLabel(ctx, m, label, doer)
186186
}
187187

188188
// AddLabels adds a list of new labels to the milestone.
189-
func (milestone *Milestone) AddLabels(doer *user_model.User, labels []*Label) error {
190-
return NewMilestoneLabels(milestone, labels, doer)
189+
func (m *Milestone) AddLabels(doer *user_model.User, labels []*Label) error {
190+
return NewMilestoneLabels(m, labels, doer)
191191
}
192192

193-
func (milestone *Milestone) addLabels(ctx context.Context, e db.Engine, labels []*Label, doer *user_model.User) error {
194-
return newMilestoneLabels(ctx, e, milestone, labels, doer)
193+
func (m *Milestone) addLabels(ctx context.Context, e db.Engine, labels []*Label, doer *user_model.User) error {
194+
return newMilestoneLabels(ctx, e, m, labels, doer)
195195
}
196196

197-
func (milestone *Milestone) removeLabel(ctx context.Context, doer *user_model.User, label *Label) error {
198-
return deleteMilestoneLabel(ctx, milestone, label, doer)
197+
func (m *Milestone) removeLabel(ctx context.Context, doer *user_model.User, label *Label) error {
198+
return deleteMilestoneLabel(ctx, m, label, doer)
199199
}
200200

201-
func (milestone *Milestone) clearLabels(ctx context.Context, e db.Engine, doer *user_model.User) (err error) {
202-
if err = milestone.loadLabels(e); err != nil {
201+
func (m *Milestone) clearLabels(ctx context.Context, e db.Engine, doer *user_model.User) (err error) {
202+
if err = m.loadLabels(e); err != nil {
203203
return fmt.Errorf("getLabels: %v", err)
204204
}
205205

206-
for i := range milestone.Labels {
207-
if err = milestone.removeLabel(ctx, doer, milestone.Labels[i]); err != nil {
206+
for i := range m.Labels {
207+
if err = m.removeLabel(ctx, doer, m.Labels[i]); err != nil {
208208
return fmt.Errorf("removeLabel: %v", err)
209209
}
210210
}
@@ -214,22 +214,22 @@ func (milestone *Milestone) clearLabels(ctx context.Context, e db.Engine, doer *
214214

215215
// ClearLabels removes all milestone labels as the given user.
216216
// Triggers appropriate WebHooks, if any.
217-
func (milestone *Milestone) ClearLabels(doer *user_model.User) (err error) {
217+
func (m *Milestone) ClearLabels(doer *user_model.User) (err error) {
218218
ctx, committer, err := db.TxContext()
219219
if err != nil {
220220
return err
221221
}
222222
defer committer.Close()
223223

224-
perm, err := access_model.GetUserRepoPermission(ctx, milestone.Repo, doer)
224+
perm, err := access_model.GetUserRepoPermission(ctx, m.Repo, doer)
225225
if err != nil {
226226
return err
227227
}
228228
if !perm.CanWriteIssuesOrPulls(true) {
229229
return ErrRepoLabelNotExist{}
230230
}
231231

232-
if err = milestone.clearLabels(ctx, db.GetEngine(ctx), doer); err != nil {
232+
if err = m.clearLabels(ctx, db.GetEngine(ctx), doer); err != nil {
233233
return err
234234
}
235235

@@ -242,37 +242,37 @@ func (milestone *Milestone) ClearLabels(doer *user_model.User) (err error) {
242242

243243
// ReplaceLabels removes all current labels and adds the given labels to the milestone.
244244
// Triggers appropriate WebHooks, if any.
245-
func (milestone *Milestone) ReplaceLabels(labels []*Label, doer *user_model.User) (err error) {
245+
func (m *Milestone) ReplaceLabels(labels []*Label, doer *user_model.User) (err error) {
246246
ctx, committer, err := db.TxContext()
247247
if err != nil {
248248
return err
249249
}
250250
defer committer.Close()
251251

252-
if err = milestone.loadLabels(db.GetEngine(ctx)); err != nil {
252+
if err = m.loadLabels(db.GetEngine(ctx)); err != nil {
253253
return err
254254
}
255255

256256
sort.Sort(labelSorter(labels))
257-
sort.Sort(labelSorter(milestone.Labels))
257+
sort.Sort(labelSorter(m.Labels))
258258

259259
var toAdd, toRemove []*Label
260260

261261
addIndex, removeIndex := 0, 0
262-
for addIndex < len(labels) && removeIndex < len(milestone.Labels) {
262+
for addIndex < len(labels) && removeIndex < len(m.Labels) {
263263
addLabel := labels[addIndex]
264-
removeLabel := milestone.Labels[removeIndex]
264+
removeLabel := m.Labels[removeIndex]
265265
if addLabel.ID == removeLabel.ID {
266266
// Silently drop invalid labels
267-
if removeLabel.RepoID != milestone.RepoID && removeLabel.OrgID != milestone.Repo.OwnerID {
267+
if removeLabel.RepoID != m.RepoID && removeLabel.OrgID != m.Repo.OwnerID {
268268
toRemove = append(toRemove, removeLabel)
269269
}
270270

271271
addIndex++
272272
removeIndex++
273273
} else if addLabel.ID < removeLabel.ID {
274274
// Only add if the label is valid
275-
if addLabel.RepoID == milestone.RepoID || addLabel.OrgID == milestone.Repo.OwnerID {
275+
if addLabel.RepoID == m.RepoID || addLabel.OrgID == m.Repo.OwnerID {
276276
toAdd = append(toAdd, addLabel)
277277
}
278278
addIndex++
@@ -282,22 +282,22 @@ func (milestone *Milestone) ReplaceLabels(labels []*Label, doer *user_model.User
282282
}
283283
}
284284
toAdd = append(toAdd, labels[addIndex:]...)
285-
toRemove = append(toRemove, milestone.Labels[removeIndex:]...)
285+
toRemove = append(toRemove, m.Labels[removeIndex:]...)
286286

287287
if len(toAdd) > 0 {
288-
if err = milestone.addLabels(ctx, db.GetEngine(ctx), toAdd, doer); err != nil {
288+
if err = m.addLabels(ctx, db.GetEngine(ctx), toAdd, doer); err != nil {
289289
return fmt.Errorf("addLabels: %v", err)
290290
}
291291
}
292292

293293
for _, l := range toRemove {
294-
if err = milestone.removeLabel(ctx, doer, l); err != nil {
294+
if err = m.removeLabel(ctx, doer, l); err != nil {
295295
return fmt.Errorf("removeLabel: %v", err)
296296
}
297297
}
298298

299-
milestone.Labels = nil
300-
if err = milestone.loadLabels(db.GetEngine(ctx)); err != nil {
299+
m.Labels = nil
300+
if err = m.loadLabels(db.GetEngine(ctx)); err != nil {
301301
return err
302302
}
303303

‎modules/convert/issue.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,20 @@ func ToLabelList(labels []*issues_model.Label, repo *repo_model.Repository, org
215215

216216
// ToAPIMilestone converts Milestone into API Format
217217
func ToAPIMilestone(m *issues_model.Milestone) *api.Milestone {
218+
var repo *repo_model.Repository
219+
var user *user_model.User
220+
if m.Repo != nil {
221+
repo = m.Repo
222+
user = m.Repo.Owner
223+
}
218224
apiMilestone := &api.Milestone{
219225
ID: m.ID,
220226
State: m.State(),
221227
Title: m.Name,
222228
Description: m.Content,
223229
OpenIssues: m.NumOpenIssues,
224230
ClosedIssues: m.NumClosedIssues,
225-
Labels: ToLabelList(m.Labels, m.Repo, m.Repo.Owner),
231+
Labels: ToLabelList(m.Labels, repo, user),
226232
Created: m.CreatedUnix.AsTime(),
227233
Updated: m.UpdatedUnix.AsTimePtr(),
228234
}

‎modules/convert/issue_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ func TestMilestone_APIFormat(t *testing.T) {
4040
IsClosed: false,
4141
NumOpenIssues: 5,
4242
NumClosedIssues: 6,
43+
Labels: make([]*issues_model.Label, 0, 1),
4344
CreatedUnix: timeutil.TimeStamp(time.Date(1999, time.January, 1, 0, 0, 0, 0, time.UTC).Unix()),
4445
UpdatedUnix: timeutil.TimeStamp(time.Date(1999, time.March, 1, 0, 0, 0, 0, time.UTC).Unix()),
4546
DeadlineUnix: timeutil.TimeStamp(time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC).Unix()),
@@ -51,6 +52,7 @@ func TestMilestone_APIFormat(t *testing.T) {
5152
Description: milestone.Content,
5253
OpenIssues: milestone.NumOpenIssues,
5354
ClosedIssues: milestone.NumClosedIssues,
55+
Labels: make([]*api.Label, 0, 1),
5456
Created: milestone.CreatedUnix.AsTime(),
5557
Updated: milestone.UpdatedUnix.AsTimePtr(),
5658
Deadline: milestone.DeadlineUnix.AsTimePtr(),

0 commit comments

Comments
 (0)