Skip to content

Commit b31c0a1

Browse files
committed
Update strava.go
1 parent 84c7d2a commit b31c0a1

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

controllers/strava.go

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,16 @@ func StravaSyncWeekForUser(user models.User, configFile models.ConfigStruct, sea
338338
}
339339

340340
if newExercise {
341-
err = StravaCreateOperationForActivity(activity, user, finalExercise)
341+
log.Println("Creating new operation for exercise based on activity.")
342+
operation, err := StravaCreateOperationForActivity(activity, user, finalExercise)
342343
if err != nil {
343344
log.Println("Failed to create operation. Error: " + err.Error())
344345
log.Println("Sport type was: " + activity.SportType)
346+
} else if operation == nil {
347+
log.Println("Failed to create operation. No error.")
348+
log.Println("Sport type was: " + activity.SportType)
345349
}
350+
346351
}
347352

348353
log.Println("Updated exercise.")
@@ -351,8 +356,9 @@ func StravaSyncWeekForUser(user models.User, configFile models.ConfigStruct, sea
351356
return
352357
}
353358

354-
func StravaCreateOperationForActivity(activity models.StravaGetActivitiesRequestReply, user models.User, exercise models.Exercise) (err error) {
359+
func StravaCreateOperationForActivity(activity models.StravaGetActivitiesRequestReply, user models.User, exercise models.Exercise) (finalOperation *models.Operation, err error) {
355360
err = nil
361+
finalOperation = nil
356362

357363
operations, err := database.GetOperationsByExerciseID(exercise.ID)
358364
if len(operations) > 0 {
@@ -365,9 +371,9 @@ func StravaCreateOperationForActivity(activity models.StravaGetActivitiesRequest
365371

366372
action, err := database.GetActionByStravaName(activity.SportType)
367373
if err != nil {
368-
return err
374+
return finalOperation, err
369375
} else if action == nil {
370-
return nil
376+
return finalOperation, nil
371377
}
372378

373379
operation := models.Operation{}
@@ -378,9 +384,11 @@ func StravaCreateOperationForActivity(activity models.StravaGetActivitiesRequest
378384

379385
operation, err = database.CreateOperationInDB(operation)
380386
if err != nil {
381-
return err
387+
return finalOperation, err
382388
}
383389

390+
finalOperation = &operation
391+
384392
operationSet := models.OperationSet{}
385393
operationSet.OperationID = operation.ID
386394
operationSet.Distance = &activity.Distance
@@ -389,7 +397,7 @@ func StravaCreateOperationForActivity(activity models.StravaGetActivitiesRequest
389397

390398
_, err = database.CreateOperationSetInDB(operationSet)
391399
if err != nil {
392-
return err
400+
return finalOperation, err
393401
}
394402

395403
return

0 commit comments

Comments
 (0)