feat: Update swagger doc and clients (#83)

Author: obalunenko

client/athletes.go

@@ -44,7 +44,7 @@ func (a athletesAPI) GetLoggedInAthlete(ctx context.Context) (models.DetailedAth
 		return models.DetailedAthlete{}, err
 	}
 
-	return *athlete.Payload, nil
+	return convertToDetailedAthlete(athlete.GetPayload()), nil
 }
 
 func (a athletesAPI) GetLoggedInAthleteZones(ctx context.Context) (models.Zones, error) {
@@ -57,7 +57,7 @@ func (a athletesAPI) GetLoggedInAthleteZones(ctx context.Context) (models.Zones,
 		return models.Zones{}, err
 	}
 
-	return *athlete.Payload, nil
+	return convertToZones(athlete.GetPayload()), nil
 }
 
 func (a athletesAPI) GetStats(ctx context.Context, id int64) (models.ActivityStats, error) {
@@ -71,7 +71,7 @@ func (a athletesAPI) GetStats(ctx context.Context, id int64) (models.ActivitySta
 		return models.ActivityStats{}, err
 	}
 
-	return *stats.Payload, nil
+	return convertToActivityStats(stats.GetPayload()), nil
 }
 
 func (a athletesAPI) UpdateLoggedInAthlete(ctx context.Context, weight float32) (models.DetailedAthlete, error) {
@@ -85,5 +85,29 @@ func (a athletesAPI) UpdateLoggedInAthlete(ctx context.Context, weight float32)
 		return models.DetailedAthlete{}, err
 	}
 
-	return *athlete.Payload, nil
+	return convertToDetailedAthlete(athlete.GetPayload()), nil
+}
+
+func convertToDetailedAthlete(athlete *models.DetailedAthlete) models.DetailedAthlete {
+	if athlete == nil {
+		return models.DetailedAthlete{}
+	}
+
+	return *athlete
+}
+
+func convertToActivityStats(stats *models.ActivityStats) models.ActivityStats {
+	if stats == nil {
+		return models.ActivityStats{}
+	}
+
+	return *stats
+}
+
+func convertToZones(zones *models.Zones) models.Zones {
+	if zones == nil {
+		return models.Zones{}
+	}
+
+	return *zones
 }

client/clubs.go

@@ -90,13 +90,7 @@ func (c clubsService) GetClubActivitiesById(ctx context.Context, id int64, opts
 		return nil, err
 	}
 
-	resp := make([]models.ClubActivity, 0, len(activities.GetPayload()))
-
-	for _, a := range activities.GetPayload() {
-		resp = append(resp, *a)
-	}
-
-	return resp, nil
+	return convertToListClubActivity(activities.GetPayload()), nil
 }
 
 func (c clubsService) GetClubAdminsById(ctx context.Context, id int64, opts ...GetClubAdminsByIdOpts) ([]models.SummaryAthlete, error) {
@@ -129,13 +123,7 @@ func (c clubsService) GetClubAdminsById(ctx context.Context, id int64, opts ...G
 		return nil, err
 	}
 
-	resp := make([]models.SummaryAthlete, 0, len(admins.GetPayload()))
-
-	for _, a := range admins.GetPayload() {
-		resp = append(resp, *a)
-	}
-
-	return resp, nil
+	return convertToListSummaryAthlete(admins.GetPayload()), nil
 }
 
 func (c clubsService) GetClubById(ctx context.Context, id int64) (models.DetailedClub, error) {
@@ -150,7 +138,7 @@ func (c clubsService) GetClubById(ctx context.Context, id int64) (models.Detaile
 		return models.DetailedClub{}, err
 	}
 
-	return *club.GetPayload(), nil
+	return convertToDetailedClub(club.GetPayload()), nil
 }
 
 func (c clubsService) GetClubMembersById(ctx context.Context, id int64, opts ...GetClubMembersByIdOpts) ([]models.ClubAthlete, error) {
@@ -183,13 +171,7 @@ func (c clubsService) GetClubMembersById(ctx context.Context, id int64, opts ...
 		return nil, err
 	}
 
-	resp := make([]models.ClubAthlete, 0, len(members.GetPayload()))
-
-	for _, m := range members.GetPayload() {
-		resp = append(resp, *m)
-	}
-
-	return resp, nil
+	return convertToListClubAthlete(members.GetPayload()), nil
 }
 
 func (c clubsService) GetLoggedInAthleteClubs(ctx context.Context, opts ...GetLoggedInAthleteClubsOpts) ([]models.SummaryClub, error) {
@@ -221,11 +203,101 @@ func (c clubsService) GetLoggedInAthleteClubs(ctx context.Context, opts ...GetLo
 		return nil, err
 	}
 
-	resp := make([]models.SummaryClub, 0, len(list.GetPayload()))
+	return convertToListSummaryClub(list.GetPayload()), nil
+}
+
+func convertToClubActivity(activity *models.ClubActivity) models.ClubActivity {
+	if activity == nil {
+		return models.ClubActivity{}
+	}
+
+	return *activity
+}
+
+func convertToSummaryAthlete(athlete *models.SummaryAthlete) models.SummaryAthlete {
+	if athlete == nil {
+		return models.SummaryAthlete{}
+	}
+
+	return *athlete
+}
+
+func convertToClubAthlete(athlete *models.ClubAthlete) models.ClubAthlete {
+	if athlete == nil {
+		return models.ClubAthlete{}
+	}
+
+	return *athlete
+}
+
+func convertToSummaryClub(club *models.SummaryClub) models.SummaryClub {
+	if club == nil {
+		return models.SummaryClub{}
+	}
+
+	return *club
+}
+
+func convertToDetailedClub(club *models.DetailedClub) models.DetailedClub {
+	if club == nil {
+		return models.DetailedClub{}
+	}
+
+	return *club
+}
+
+func convertToListSummaryClub(clubs []*models.SummaryClub) []models.SummaryClub {
+	if clubs == nil {
+		return nil
+	}
+
+	list := make([]models.SummaryClub, len(clubs))
+
+	for i, club := range clubs {
+		list[i] = convertToSummaryClub(club)
+	}
+
+	return list
+}
+
+func convertToListClubActivity(activities []*models.ClubActivity) []models.ClubActivity {
+	if activities == nil {
+		return nil
+	}
+
+	list := make([]models.ClubActivity, len(activities))
+
+	for i, activity := range activities {
+		list[i] = convertToClubActivity(activity)
+	}
+
+	return list
+}
+
+func convertToListClubAthlete(athletes []*models.ClubAthlete) []models.ClubAthlete {
+	if athletes == nil {
+		return nil
+	}
+
+	list := make([]models.ClubAthlete, len(athletes))
+
+	for i, athlete := range athletes {
+		list[i] = convertToClubAthlete(athlete)
+	}
+
+	return list
+}
+
+func convertToListSummaryAthlete(athletes []*models.SummaryAthlete) []models.SummaryAthlete {
+	if athletes == nil {
+		return nil
+	}
+
+	list := make([]models.SummaryAthlete, len(athletes))
 
-	for _, cl := range list.GetPayload() {
-		resp = append(resp, *cl)
+	for i, athlete := range athletes {
+		list[i] = convertToSummaryAthlete(athlete)
 	}
 
-	return resp, nil
+	return list
 }

client/efforts.go

@@ -100,26 +100,10 @@ func (s segmentsEffortsService) GetSegmentEffortById(ctx context.Context, id int
 }
 
 // convert to models.DetailedSegmentEffort
-func convertToSegmentEffort(effort *segment_efforts.GetSegmentEffortByIDOKBody) models.DetailedSegmentEffort {
-	if effort.HeartRateDetails.AverageHeartrate != 0 || effort.HeartRateDetails.MaxHeartrate != 0 {
-		effort.HeartRateDetails.HasHeartrate = true
+func convertToSegmentEffort(effort *models.DetailedSegmentEffort) models.DetailedSegmentEffort {
+	if effort == nil {
+		return models.DetailedSegmentEffort{}
 	}
 
-	return models.DetailedSegmentEffort{
-		SummarySegmentEffort: effort.SummarySegmentEffort,
-		HeartRateDetails:     effort.HeartRateDetails,
-		Activity:             effort.Activity,
-		Athlete:              effort.Athlete,
-		AverageCadence:       effort.AverageCadence,
-		AverageWatts:         effort.AverageWatts,
-		DeviceWatts:          effort.DeviceWatts,
-		EndIndex:             effort.EndIndex,
-		Hidden:               effort.Hidden,
-		KomRank:              effort.KomRank,
-		MovingTime:           effort.MovingTime,
-		Name:                 effort.Name,
-		PrRank:               effort.PrRank,
-		Segment:              effort.Segment,
-		StartIndex:           effort.StartIndex,
-	}
+	return *effort
 }

client/gears.go

@@ -39,5 +39,13 @@ func (g gearsService) GetGearById(ctx context.Context, id string) (models.Detail
 		return models.DetailedGear{}, err
 	}
 
-	return *gear.GetPayload(), nil
+	return convertToDetailedGear(gear.GetPayload()), nil
+}
+
+func convertToDetailedGear(gear *models.DetailedGear) models.DetailedGear {
+	if gear == nil {
+		return models.DetailedGear{}
+	}
+
+	return *gear
 }

client/routes.go

@@ -116,24 +116,10 @@ func (r routesService) GetRoutesByAthleteId(ctx context.Context, opts ...GetRout
 }
 
 // convertToModelsRoute converts routes.GetRouteByIDOKBody to models.Route
-func convertToModelsRoute(route *routes.GetRouteByIDOKBody) models.Route {
-	return models.Route{
-		Athlete:             route.Athlete,
-		CreatedAt:           route.CreatedAt,
-		Description:         route.Description,
-		Distance:            route.Distance,
-		ElevationGain:       route.ElevationGain,
-		EstimatedMovingTime: route.EstimatedMovingTime,
-		ID:                  route.ID,
-		IDStr:               route.IDStr,
-		Map:                 route.Map,
-		Name:                route.Name,
-		Private:             route.Private,
-		Segments:            route.Segments,
-		Starred:             route.Starred,
-		SubType:             route.SubType,
-		Timestamp:           route.Timestamp,
-		Type:                route.Type,
-		UpdatedAt:           route.UpdatedAt,
+func convertToModelsRoute(route *models.Route) models.Route {
+	if route == nil {
+		return models.Route{}
 	}
+
+	return *route
 }

client/segments.go

@@ -79,7 +79,7 @@ func (s segmentsService) ExploreSegments(ctx context.Context, bounds []float32,
 		return models.ExplorerResponse{}, err
 	}
 
-	return *resp.Payload, nil
+	return convertToExplorerResponse(resp.GetPayload()), nil
 }
 
 func (s segmentsService) GetLoggedInAthleteStarredSegments(ctx context.Context, opts ...GetLoggedInAthleteStarredSegmentsOpts) ([]models.SummarySegment, error) {
@@ -110,13 +110,7 @@ func (s segmentsService) GetLoggedInAthleteStarredSegments(ctx context.Context,
 		return nil, err
 	}
 
-	list := make([]models.SummarySegment, len(resp.Payload))
-
-	for i, v := range resp.Payload {
-		list[i] = *v
-	}
-
-	return list, nil
+	return convertToListSummarySegment(resp.GetPayload()), nil
 }
 
 func (s segmentsService) GetSegmentById(ctx context.Context, id int64) (models.DetailedSegment, error) {
@@ -131,7 +125,7 @@ func (s segmentsService) GetSegmentById(ctx context.Context, id int64) (models.D
 		return models.DetailedSegment{}, err
 	}
 
-	return *resp.Payload, nil
+	return convertToDetailedSegment(resp.GetPayload()), nil
 }
 
 func (s segmentsService) StarSegment(ctx context.Context, starred bool, id int64) (models.DetailedSegment, error) {
@@ -147,5 +141,43 @@ func (s segmentsService) StarSegment(ctx context.Context, starred bool, id int64
 		return models.DetailedSegment{}, err
 	}
 
-	return *resp.Payload, nil
+	return convertToDetailedSegment(resp.GetPayload()), nil
+}
+
+func convertToDetailedSegment(segment *models.DetailedSegment) models.DetailedSegment {
+	if segment == nil {
+		return models.DetailedSegment{}
+	}
+
+	return *segment
+}
+
+func convertToSummarySegment(segment *models.SummarySegment) models.SummarySegment {
+	if segment == nil {
+		return models.SummarySegment{}
+	}
+
+	return *segment
+}
+
+func convertToListSummarySegment(segments []*models.SummarySegment) []models.SummarySegment {
+	if segments == nil {
+		return nil
+	}
+
+	list := make([]models.SummarySegment, len(segments))
+
+	for i, segment := range segments {
+		list[i] = convertToSummarySegment(segment)
+	}
+
+	return list
+}
+
+func convertToExplorerResponse(response *models.ExplorerResponse) models.ExplorerResponse {
+	if response == nil {
+		return models.ExplorerResponse{}
+	}
+
+	return *response
 }