Skip to content

Commit efd2bae

Browse files
konrad2002konrad2002
authored
Merge pull request #9 from SwimResults/develop
develop
2 parents 324580a + fc76f88 commit efd2bae

File tree

5 files changed

+57
-36
lines changed

5 files changed

+57
-36
lines changed

‎README.md‎

Lines changed: 51 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,54 @@
77

88
## Endpoints
99

10-
[GIN-debug] GET /meeting --> sr-meeting/meeting-service/controller.getMeetings (3 handlers)
11-
[GIN-debug] GET /meeting/:id --> sr-meeting/meeting-service/controller.getMeeting (3 handlers)
12-
[GIN-debug] GET /meeting/meet_id/:meet_id --> sr-meeting/meeting-service/controller.getMeetingByMeetId (3 handlers)
13-
[GIN-debug] GET /meeting/between/:date_start/:date_end --> sr-meeting/meeting-service/controller.getMeetingWithDateBetween (3 handlers)
14-
[GIN-debug] DELETE /meeting/:id --> sr-meeting/meeting-service/controller.removeMeeting (3 handlers)
15-
[GIN-debug] POST /meeting --> sr-meeting/meeting-service/controller.addMeeting (3 handlers)
16-
[GIN-debug] PUT /meeting --> sr-meeting/meeting-service/controller.updateMeeting (3 handlers)
17-
[GIN-debug] GET /meeting_series --> sr-meeting/meeting-service/controller.getMeetingSeries (3 handlers)
18-
[GIN-debug] GET /meeting_series/:id --> sr-meeting/meeting-service/controller.getMeetingSeriesById (3 handlers)
19-
[GIN-debug] DELETE /meeting_series/:id --> sr-meeting/meeting-service/controller.removeMeetingSeries (3 handlers)
20-
[GIN-debug] POST /meeting_series --> sr-meeting/meeting-service/controller.addMeetingSeries (3 handlers)
21-
[GIN-debug] PUT /meeting_series --> sr-meeting/meeting-service/controller.updateMeetingSeries (3 handlers)
22-
[GIN-debug] GET /location --> sr-meeting/meeting-service/controller.getLocations (3 handlers)
23-
[GIN-debug] GET /location/:id --> sr-meeting/meeting-service/controller.getLocation (3 handlers)
24-
[GIN-debug] POST /location --> sr-meeting/meeting-service/controller.addLocation (3 handlers)
25-
[GIN-debug] PUT /location --> sr-meeting/meeting-service/controller.updateLocation (3 handlers)
26-
[GIN-debug] DELETE /location/:id --> sr-meeting/meeting-service/controller.removeLocation (3 handlers)
27-
[GIN-debug] GET /style --> sr-meeting/meeting-service/controller.getStyles (3 handlers)
28-
[GIN-debug] GET /style/:id --> sr-meeting/meeting-service/controller.getStyle (3 handlers)
29-
[GIN-debug] GET /style/name/:name --> sr-meeting/meeting-service/controller.getStyleByName (3 handlers)
30-
[GIN-debug] DELETE /style/:id --> sr-meeting/meeting-service/controller.removeStyle (3 handlers)
31-
[GIN-debug] POST /style --> sr-meeting/meeting-service/controller.addStyle (3 handlers)
32-
[GIN-debug] PUT /style --> sr-meeting/meeting-service/controller.updateStyle (3 handlers)
33-
[GIN-debug] GET /event --> sr-meeting/meeting-service/controller.getEvents (3 handlers)
34-
[GIN-debug] GET /event/:id --> sr-meeting/meeting-service/controller.getEvent (3 handlers)
35-
[GIN-debug] GET /event/meet/:meet_id --> sr-meeting/meeting-service/controller.getEventsByMeetId (3 handlers)
36-
[GIN-debug] GET /event/meet/:meet_id/event/:event_id --> sr-meeting/meeting-service/controller.getEventByMeetingAndNumber (3 handlers)
37-
[GIN-debug] DELETE /event/:id --> sr-meeting/meeting-service/controller.removeEvent (3 handlers)
38-
[GIN-debug] POST /event --> sr-meeting/meeting-service/controller.addEvent (3 handlers)
39-
[GIN-debug] PUT /event --> sr-meeting/meeting-service/controller.updateEvent (3 handlers)
40-
[GIN-debug] GET /actuator --> sr-meeting/meeting-service/controller.actuator (3 handlers)
10+
[GIN-debug] GET /meeting --> github.com/swimresults/meeting-service/controller.getMeetings (3 handlers)
11+
[GIN-debug] GET /meeting/:id --> github.com/swimresults/meeting-service/controller.getMeeting (3 handlers)
12+
[GIN-debug] GET /meeting/meet/:meet_id --> github.com/swimresults/meeting-service/controller.getMeetingByMeetId (3 handlers)
13+
[GIN-debug] GET /meeting/between/:date_start/:date_end --> github.com/swimresults/meeting-service/controller.getMeetingWithDateBetween (3 handlers)
14+
[GIN-debug] DELETE /meeting/:id --> github.com/swimresults/meeting-service/controller.removeMeeting (3 handlers)
15+
[GIN-debug] POST /meeting --> github.com/swimresults/meeting-service/controller.addMeeting (3 handlers)
16+
[GIN-debug] PUT /meeting --> github.com/swimresults/meeting-service/controller.updateMeeting (3 handlers)
17+
[GIN-debug] GET /meeting_series --> github.com/swimresults/meeting-service/controller.getMeetingSeries (3 handlers)
18+
[GIN-debug] GET /meeting_series/:id --> github.com/swimresults/meeting-service/controller.getMeetingSeriesById (3 handlers)
19+
[GIN-debug] DELETE /meeting_series/:id --> github.com/swimresults/meeting-service/controller.removeMeetingSeries (3 handlers)
20+
[GIN-debug] POST /meeting_series --> github.com/swimresults/meeting-service/controller.addMeetingSeries (3 handlers)
21+
[GIN-debug] PUT /meeting_series --> github.com/swimresults/meeting-service/controller.updateMeetingSeries (3 handlers)
22+
[GIN-debug] GET /location --> github.com/swimresults/meeting-service/controller.getLocations (3 handlers)
23+
[GIN-debug] GET /location/:id --> github.com/swimresults/meeting-service/controller.getLocation (3 handlers)
24+
[GIN-debug] POST /location --> github.com/swimresults/meeting-service/controller.addLocation (3 handlers)
25+
[GIN-debug] PUT /location --> github.com/swimresults/meeting-service/controller.updateLocation (3 handlers)
26+
[GIN-debug] DELETE /location/:id --> github.com/swimresults/meeting-service/controller.removeLocation (3 handlers)
27+
[GIN-debug] GET /style --> github.com/swimresults/meeting-service/controller.getStyles (3 handlers)
28+
[GIN-debug] GET /style/:id --> github.com/swimresults/meeting-service/controller.getStyle (3 handlers)
29+
[GIN-debug] GET /style/name/:name --> github.com/swimresults/meeting-service/controller.getStyleByName (3 handlers)
30+
[GIN-debug] DELETE /style/:id --> github.com/swimresults/meeting-service/controller.removeStyle (3 handlers)
31+
[GIN-debug] POST /style --> github.com/swimresults/meeting-service/controller.addStyle (3 handlers)
32+
[GIN-debug] PUT /style --> github.com/swimresults/meeting-service/controller.updateStyle (3 handlers)
33+
[GIN-debug] GET /event --> github.com/swimresults/meeting-service/controller.getEvents (3 handlers)
34+
[GIN-debug] GET /event/:id --> github.com/swimresults/meeting-service/controller.getEvent (3 handlers)
35+
[GIN-debug] GET /event/meet/:meet_id --> github.com/swimresults/meeting-service/controller.getEventsByMeetId (3 handlers)
36+
[GIN-debug] GET /event/meet/:meet_id/parts --> github.com/swimresults/meeting-service/controller.getEventsAsPartsByMeetId (3 handlers)
37+
[GIN-debug] GET /event/meet/:meet_id/event/:event_id --> github.com/swimresults/meeting-service/controller.getEventByMeetingAndNumber (3 handlers)
38+
[GIN-debug] GET /event/meet/:meet_id/event/:event_id/livetiming --> github.com/swimresults/meeting-service/controller.getEventByMeetingAndNumberForLivetiming (3 handlers)
39+
[GIN-debug] POST /event --> github.com/swimresults/meeting-service/controller.addEvent (3 handlers)
40+
[GIN-debug] POST /event/import --> github.com/swimresults/meeting-service/controller.importEvent (3 handlers)
41+
[GIN-debug] POST /event/meet/:meet_id/event/:event_id/certification --> github.com/swimresults/meeting-service/controller.updateEventCertification (3 handlers)
42+
[GIN-debug] DELETE /event/:id --> github.com/swimresults/meeting-service/controller.removeEvent (3 handlers)
43+
[GIN-debug] PUT /event --> github.com/swimresults/meeting-service/controller.updateEvent (3 handlers)
44+
[GIN-debug] GET /file --> github.com/swimresults/meeting-service/controller.getFiles (3 handlers)
45+
[GIN-debug] GET /file/:id --> github.com/swimresults/meeting-service/controller.getFile (3 handlers)
46+
[GIN-debug] GET /file/meeting/list/:meeting --> github.com/swimresults/meeting-service/controller.getFileListByMeeting (3 handlers)
47+
[GIN-debug] GET /file/meeting/:meeting/name/:name --> github.com/swimresults/meeting-service/controller.getFileByNameAndMeeting (3 handlers)
48+
[GIN-debug] DELETE /file/:id --> github.com/swimresults/meeting-service/controller.removeFile (3 handlers)
49+
[GIN-debug] POST /file --> github.com/swimresults/meeting-service/controller.addFile (3 handlers)
50+
[GIN-debug] POST /file/increment --> github.com/swimresults/meeting-service/controller.incrementDownloads (3 handlers)
51+
[GIN-debug] PUT /file --> github.com/swimresults/meeting-service/controller.updateFile (3 handlers)
52+
[GIN-debug] GET /age_group --> github.com/swimresults/meeting-service/controller.getAgeGroups (3 handlers)
53+
[GIN-debug] GET /age_group/:id --> github.com/swimresults/meeting-service/controller.getAgeGroup (3 handlers)
54+
[GIN-debug] GET /age_group/meet/:meet_id --> github.com/swimresults/meeting-service/controller.getAgeGroupsByMeeting (3 handlers)
55+
[GIN-debug] GET /age_group/meet/:meet_id/event/:event_id --> github.com/swimresults/meeting-service/controller.getAgeGroupByMeetingAndEvent (3 handlers)
56+
[GIN-debug] POST /age_group --> github.com/swimresults/meeting-service/controller.addAgeGroup (3 handlers)
57+
[GIN-debug] POST /age_group/import --> github.com/swimresults/meeting-service/controller.importAgeGroup (3 handlers)
58+
[GIN-debug] DELETE /age_group/:id --> github.com/swimresults/meeting-service/controller.removeAgeGroup (3 handlers)
59+
[GIN-debug] PUT /age_group --> github.com/swimresults/meeting-service/controller.updateAgeGroup (3 handlers)
60+
[GIN-debug] GET /actuator --> github.com/swimresults/meeting-service/controller.actuator (3 handlers)

‎model/age_group.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type AgeGroup struct {
1313
Gender string `json:"gender,omitempty" bson:"gender,omitempty"` // MALE, FEMALE, MIXED
1414
MinAge string `json:"min_age,omitempty" bson:"min_age,omitempty"` // 2004
1515
MaxAge string `json:"max_age,omitempty" bson:"max_age,omitempty"` // 2002
16-
Ages []string `json:"ages,omitempty" bson:"ages,omitempty"` // 2002, 2003, 2004
16+
Ages []int `json:"ages,omitempty" bson:"ages,omitempty"` // 2002, 2003, 2004
1717
IsYear bool `json:"is_year,omitempty" bson:"is_year,omitempty"` // true
1818
Name string `json:"name,omitempty" bson:"name,omitempty"` // Jahrgänge 2002 - 2004
1919
AddedAt time.Time `json:"added_at,omitempty" bson:"added_at,omitempty"`

‎model/event.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ type Event struct {
1818
Part MeetingPart `json:"part,omitempty" bson:"part,omitempty"` // PDF + DSV
1919
Finished bool `json:"finished,omitempty" bson:"finished,omitempty"` // PDF + DSV + Livetiming
2020
Certified bool `json:"certified,omitempty" bson:"certified,omitempty"` // PDF + DSV ! used for result file links
21+
NoStartList bool `json:"no_start_list,omitempty" bson:"no_start_list,omitempty"` // manually ! used for start list file links
2122
Ordering int `json:"ordering,omitempty" bson:"ordering,omitempty"` // automatically / manually
2223
AddedAt time.Time `json:"added_at,omitempty" bson:"added_at,omitempty"` // automatically
2324
UpdatedAt time.Time `json:"updated_at,omitempty" bson:"updated_at,omitempty"` // automatically

‎service/age_group_service.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func getAgeGroupsByBsonDocument(d primitive.D) ([]model.AgeGroup, error) {
2727
defer cancel()
2828

2929
queryOptions := options.FindOptions{}
30-
queryOptions.SetSort(bson.D{{"min_age", 1}})
30+
queryOptions.SetSort(bson.D{{"min_age", -1}})
3131

3232
cursor, err := ageGroupCollection.Find(ctx, d, &queryOptions)
3333
if err != nil {
@@ -113,7 +113,7 @@ func ImportAgeGroup(group model.AgeGroup) (*model.AgeGroup, bool, error) {
113113
if err2 != nil {
114114
return nil, false, err2
115115
}
116-
return &newGroup, false, nil
116+
return &newGroup, true, nil
117117
}
118118

119119
group.Identifier = existing.Identifier
@@ -176,6 +176,6 @@ func SetAgesForAgeGroup(group *model.AgeGroup) {
176176
if i < 1900 || i > 2050 {
177177
continue
178178
}
179-
group.Ages = append(group.Ages, strconv.Itoa(i))
179+
group.Ages = append(group.Ages, i)
180180
}
181181
}

‎service/age_group_service_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ func TestSetAgesForAgeGroup(t *testing.T) {
1616

1717
SetAgesForAgeGroup(&group)
1818

19-
assert.Equal(t, []string{"2002", "2003", "2004"}, group.Ages)
19+
assert.Equal(t, []int{2002, 2003, 2004}, group.Ages)
2020
}

0 commit comments

Comments
 (0)