Skip to content

Commit d571830

Browse files
edospadoniedospadoni
authored
sun & wax. changed traffic type to int64 (#146)
1 parent de41290 commit d571830

File tree

10 files changed

+30
-29
lines changed

10 files changed

+30
-29
lines changed

‎deploy/ansible/roles/icarodb/files/icaro.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ CREATE TABLE `hotspot_vouchers` (
9393
`bandwidth_up` integer unsigned,
9494
`bandwidth_down` integer unsigned,
9595
`duration` integer unsigned,
96-
`max_traffic` integer unsigned,
96+
`max_traffic` bigint unsigned,
9797
`max_time` integer unsigned,
9898
`remain_use` integer,
9999
`expires` datetime DEFAULT NULL,
@@ -123,7 +123,7 @@ CREATE TABLE `users` (
123123
`survey_auth` tinyint NOT NULL,
124124
`kbps_down` integer unsigned,
125125
`kbps_up` integer unsigned,
126-
`max_navigation_traffic` integer unsigned,
126+
`max_navigation_traffic` bigint unsigned,
127127
`max_navigation_time` integer unsigned,
128128
`auto_login` tinyint NOT NULL,
129129
`valid_from` datetime,
@@ -154,7 +154,7 @@ CREATE TABLE `user_histories` (
154154
`survey_auth` tinyint NOT NULL,
155155
`kbps_down` integer unsigned,
156156
`kbps_up` integer unsigned,
157-
`max_navigation_traffic` integer unsigned,
157+
`max_navigation_traffic` bigint unsigned,
158158
`max_navigation_time` integer unsigned,
159159
`auto_login` tinyint NOT NULL,
160160
`valid_from` datetime,

‎sun/sun-api/models/hotspot_voucher.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type HotspotVoucher struct {
3232
BandwidthUp int `db:"bandwidth_up" json:"bandwidth_up"`
3333
BandwidthDown int `db:"bandwidth_down" json:"bandwidth_down"`
3434
Duration int `db:"duration" json:"duration"`
35-
MaxTraffic int `db:"max_traffic" json:"max_traffic"`
35+
MaxTraffic int64 `db:"max_traffic" json:"max_traffic"`
3636
MaxTime int `db:"max_time" json:"max_time"`
3737
RemainUse int `db:"remain_use" json:"remain_use"`
3838
Expires time.Time `db:"expires" json:"expires"`
@@ -54,7 +54,7 @@ type HotspotVoucherJSON struct {
5454
Time string `json:"time"`
5555
Duration int `db:"duration" json:"duration"`
5656
Expiration int `json:"expiration"`
57-
MaxTraffic int `db:"max_traffic" json:"max_traffic"`
57+
MaxTraffic int64 `db:"max_traffic" json:"max_traffic"`
5858
MaxTime int `db:"max_time" json:"max_time"`
5959
RemainUse int `db:"remain_use" json:"remain_use"`
6060
Expires time.Time `db:"expires" json:"expires"`

‎sun/sun-api/models/session.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ type Session struct {
3131
DeviceMAC string `db:"device_mac" json:"device_mac"`
3232
IpAddress string `db:"ip_address" json:"ip_address"`
3333
Username string `db:"username" json:"username"`
34-
BytesUp int `db:"bytes_up" json:"bytes_up"`
35-
BytesDown int `db:"bytes_down" json:"bytes_down"`
34+
BytesUp int64 `db:"bytes_up" json:"bytes_up"`
35+
BytesDown int64 `db:"bytes_down" json:"bytes_down"`
3636
Duration int `db:"duration" json:"duration"`
3737
AuthTime time.Time `db:"auth_time" json:"auth_time"`
3838
StartTime time.Time `db:"start_time" json:"start_time"`
@@ -54,12 +54,12 @@ type Session struct {
5454
}
5555

5656
type SessionLimit struct {
57-
TrafficBytes int `db:"traffic_bytes" json:"traffic_bytes"`
58-
DurationSeconds int `db:"duration_seconds" json:"duration_seconds"`
57+
TrafficBytes int64 `db:"traffic_bytes" json:"traffic_bytes"`
58+
DurationSeconds int `db:"duration_seconds" json:"duration_seconds"`
5959
}
6060
type SessionHistoryLimit struct {
61-
TrafficBytes int `db:"traffic_bytes" json:"traffic_bytes"`
62-
DurationSeconds int `db:"duration_seconds" json:"duration_seconds"`
61+
TrafficBytes int64 `db:"traffic_bytes" json:"traffic_bytes"`
62+
DurationSeconds int `db:"duration_seconds" json:"duration_seconds"`
6363
}
6464

6565
func (SessionLimit) TableName() string {

‎sun/sun-api/models/session_history.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ type SessionHistory struct {
3232
DeviceMAC string `db:"device_mac" json:"device_mac"`
3333
IpAddress string `db:"ip_address" json:"ip_address"`
3434
Username string `db:"username" json:"username"`
35-
BytesUp int `db:"bytes_up" json:"bytes_up"`
36-
BytesDown int `db:"bytes_down" json:"bytes_down"`
35+
BytesUp int64 `db:"bytes_up" json:"bytes_up"`
36+
BytesDown int64 `db:"bytes_down" json:"bytes_down"`
3737
Duration int `db:"duration" json:"duration"`
3838
AuthTime time.Time `db:"auth_time" json:"auth_time"`
3939
StartTime time.Time `db:"start_time" json:"start_time"`

‎sun/sun-api/models/user.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type User struct {
3939
SurveyAuth bool `db:"survey_auth" json:"survey_auth"`
4040
KbpsDown int `db:"kbps_down" json:"kbps_down"`
4141
KbpsUp int `db:"kbps_up" json:"kbps_up"`
42-
MaxNavigationTraffic int `db:"max_navigation_traffic" json:"max_navigation_traffic"`
42+
MaxNavigationTraffic int64 `db:"max_navigation_traffic" json:"max_navigation_traffic"`
4343
MaxNavigationTime int `db:"max_navigation_time" json:"max_navigation_time"`
4444
AutoLogin bool `db:"auto_login" json:"auto_login"`
4545
ValidFrom time.Time `db:"valid_from" json:"valid_from"`
@@ -62,9 +62,9 @@ type UserJSON struct {
6262
SurveyAuth bool `db:"survey_auth" json:"survey_auth"`
6363
KbpsDown int `db:"kbps_down" json:"kbps_down"`
6464
KbpsUp int `db:"kbps_up" json:"kbps_up"`
65-
MaxNavigationTraffic int `db:"max_navigation_traffic" json:"max_navigation_traffic"`
65+
MaxNavigationTraffic int64 `db:"max_navigation_traffic" json:"max_navigation_traffic"`
6666
MaxNavigationTime int `db:"max_navigation_time" json:"max_navigation_time"`
67-
MaxNavigationTrafficLimit int `db:"max_navigation_traffic_limit" json:"max_navigation_traffic_limit"`
67+
MaxNavigationTrafficLimit int64 `db:"max_navigation_traffic_limit" json:"max_navigation_traffic_limit"`
6868
MaxNavigationTimeLimit int `db:"max_navigation_time_limit" json:"max_navigation_time_limit"`
6969
AutoLogin bool `db:"auto_login" json:"auto_login"`
7070
ValidFrom time.Time `db:"valid_from" json:"valid_from"`

‎sun/sun-api/models/user_history.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type UserHistory struct {
4040
SurveyAuth bool `db:"survey_auth" json:"survey_auth"`
4141
KbpsDown int `db:"kbps_down" json:"kbps_down"`
4242
KbpsUp int `db:"kbps_up" json:"kbps_up"`
43-
MaxNavigationTraffic int `db:"max_navigation_traffic" json:"max_navigation_traffic"`
43+
MaxNavigationTraffic int64 `db:"max_navigation_traffic" json:"max_navigation_traffic"`
4444
MaxNavigationTime int `db:"max_navigation_time" json:"max_navigation_time"`
4545
AutoLogin bool `db:"auto_login" json:"auto_login"`
4646
ValidFrom time.Time `db:"valid_from" json:"valid_from"`

‎wax/methods/auth_others.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func SMSAuth(c *gin.Context) {
7373
upInt, _ := strconv.Atoi(up.Value)
7474

7575
maxTraffic := utils.GetHotspotPreferencesByKey(unit.HotspotId, "CoovaChilli-Max-Total-Octets")
76-
maxTrafficInt, _ := strconv.Atoi(maxTraffic.Value)
76+
maxTrafficInt, _ := strconv.ParseInt(maxTraffic.Value, 10, 64)
7777

7878
maxTime := utils.GetHotspotPreferencesByKey(unit.HotspotId, "CoovaChilli-Max-Navigation-Time")
7979
maxTimeInt, _ := strconv.Atoi(maxTime.Value)
@@ -243,7 +243,7 @@ func EmailAuth(c *gin.Context) {
243243
upInt, _ := strconv.Atoi(up.Value)
244244

245245
maxTraffic := utils.GetHotspotPreferencesByKey(unit.HotspotId, "CoovaChilli-Max-Total-Octets")
246-
maxTrafficInt, _ := strconv.Atoi(maxTraffic.Value)
246+
maxTrafficInt, _ := strconv.ParseInt(maxTraffic.Value, 10, 64)
247247

248248
maxTime := utils.GetHotspotPreferencesByKey(unit.HotspotId, "CoovaChilli-Max-Navigation-Time")
249249
maxTimeInt, _ := strconv.Atoi(maxTime.Value)

‎wax/methods/auth_social.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func FacebookAuth(c *gin.Context) {
152152
upInt, _ := strconv.Atoi(up.Value)
153153

154154
maxTraffic := utils.GetHotspotPreferencesByKey(unit.HotspotId, "CoovaChilli-Max-Total-Octets")
155-
maxTrafficInt, _ := strconv.Atoi(maxTraffic.Value)
155+
maxTrafficInt, _ := strconv.ParseInt(maxTraffic.Value, 10, 64)
156156

157157
maxTime := utils.GetHotspotPreferencesByKey(unit.HotspotId, "CoovaChilli-Max-Navigation-Time")
158158
maxTimeInt, _ := strconv.Atoi(maxTime.Value)
@@ -358,7 +358,7 @@ func LinkedInAuth(c *gin.Context) {
358358
upInt, _ := strconv.Atoi(up.Value)
359359

360360
maxTraffic := utils.GetHotspotPreferencesByKey(unit.HotspotId, "CoovaChilli-Max-Total-Octets")
361-
maxTrafficInt, _ := strconv.Atoi(maxTraffic.Value)
361+
maxTrafficInt, _ := strconv.ParseInt(maxTraffic.Value, 10, 64)
362362

363363
maxTime := utils.GetHotspotPreferencesByKey(unit.HotspotId, "CoovaChilli-Max-Navigation-Time")
364364
maxTimeInt, _ := strconv.Atoi(maxTime.Value)
@@ -536,7 +536,7 @@ func InstagramAuth(c *gin.Context) {
536536
upInt, _ := strconv.Atoi(up.Value)
537537

538538
maxTraffic := utils.GetHotspotPreferencesByKey(unit.HotspotId, "CoovaChilli-Max-Total-Octets")
539-
maxTrafficInt, _ := strconv.Atoi(maxTraffic.Value)
539+
maxTrafficInt, _ := strconv.ParseInt(maxTraffic.Value, 10, 64)
540540

541541
maxTime := utils.GetHotspotPreferencesByKey(unit.HotspotId, "CoovaChilli-Max-Navigation-Time")
542542
maxTimeInt, _ := strconv.Atoi(maxTime.Value)

‎wax/methods/counters.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ func stopSession(sessionId string, unitMacAddress string, bytesDown string, byte
122122
if d, err := strconv.Atoi(duration); err == nil {
123123
session.Duration = d
124124
}
125-
if bd, err := strconv.Atoi(bytesDown); err == nil {
125+
if bd, err := strconv.ParseInt(bytesDown, 10, 64); err == nil {
126126
session.BytesDown = bd
127127
}
128-
if bu, err := strconv.Atoi(bytesUp); err == nil {
128+
if bu, err := strconv.ParseInt(bytesUp, 10, 64); err == nil {
129129
session.BytesUp = bu
130130
}
131131

@@ -175,10 +175,10 @@ func updateSession(sessionId string, unitMacAddress string, bytesDown string, by
175175
if d, err := strconv.Atoi(duration); err == nil {
176176
session.Duration = d
177177
}
178-
if bd, err := strconv.Atoi(bytesDown); err == nil {
178+
if bd, err := strconv.ParseInt(bytesDown, 10, 64); err == nil {
179179
session.BytesDown = bd
180180
}
181-
if bu, err := strconv.Atoi(bytesUp); err == nil {
181+
if bu, err := strconv.ParseInt(bytesUp, 10, 64); err == nil {
182182
session.BytesUp = bu
183183
}
184184

‎wax/utils/utils.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ func GetUsersByMacAddressAndunitMacAddress(mac string, unitMacAddress string) (b
539539
return true, users
540540
}
541541

542-
func GetTodaySessionTrafficByUser(user models.User) int {
542+
func GetTodaySessionTrafficByUser(user models.User) int64 {
543543
// calculate today midnight
544544
now := time.Now().UTC()
545545
midnightToday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
@@ -551,7 +551,8 @@ func GetTodaySessionTrafficByUser(user models.User) int {
551551
db.Where("update_time >= ? AND user_id = ?", midnightToday, user.Id).Find(&sessions)
552552
db.Where("update_time >= ? AND user_id = ?", midnightToday, user.Id).Find(&sessionHistories)
553553

554-
var todayTraffic = 0
554+
var todayTraffic int64
555+
todayTraffic = 0
555556

556557
for _, session := range sessions {
557558
todayTraffic += session.BytesDown + session.BytesUp
@@ -587,7 +588,7 @@ func GetTodaySessionTimeByUser(user models.User) int {
587588
return todayTime
588589
}
589590

590-
func CalculateRemainTraffic(user models.User) int {
591+
func CalculateRemainTraffic(user models.User) int64 {
591592
// get today total navigation traffic for user
592593
totalTraffic := GetTodaySessionTrafficByUser(user)
593594
remainTraffic := user.MaxNavigationTraffic - totalTraffic

0 commit comments

Comments
 (0)