FJurmanovic/wallet-go-api
1
0
Fork 0
mirror of https://github.com/FJurmanovic/wallet-go-api.git synced 2026-02-06 06:08:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use timezone from database

Browse Source
This commit is contained in:
Fran Jurmanović
2021-06-27 11:38:28 +02:00
parent 5c6aad39cd
commit a5f8a8818c
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/services/subscriptions.go
View File

@@ -24,9 +24,9 @@ func (as *SubscriptionService) New(body *models.NewSubscriptionBody) *models.Sub
tm.SubscriptionTypeID = body.SubscriptionTypeID
tm.CustomRange = int(customRange)
tm.Description = body.Description
tm.StartDate = body.StartDate.Local()
tm.StartDate = body.StartDate
tm.HasEnd = body.HasEnd
tm.EndDate = body.EndDate.Local()
tm.EndDate = body.EndDate
tm.Amount = float32(math.Round(amount*100) / 100)
if body.StartDate.IsZero() {
@@ -63,11 +63,12 @@ func (as *SubscriptionService) SubToTrans(subModel *models.Subscription) {
currentLocation := now.Location()
firstOfNextMonth := time.Date(currentYear, currentMonth+1, 1, 0, 0, 0, 0, currentLocation)
tzFirstOfNextMonth := firstOfNextMonth.In(subModel.StartDate.Location())
startDate := subModel.StartDate.Local()
stopDate := firstOfNextMonth
if subModel.HasEnd && subModel.EndDate.Local().Before(firstOfNextMonth) {
stopDate = subModel.EndDate.Local()
startDate := subModel.StartDate
stopDate := tzFirstOfNextMonth
if subModel.HasEnd && subModel.EndDate.Before(tzFirstOfNextMonth) {
stopDate = subModel.EndDate
}
transactions := new([]models.Transaction)