sun. api & ui: fix csv export of users

Author: edospadoni

sun/sun-api/methods/users.go

@@ -252,6 +252,7 @@ func GetUsersExpired(c *gin.Context) {
 	limit := c.Query("limit")
 	hotspotId := c.Query("hotspot")
 	accountType := c.Query("type")
+	marketing := c.Query("marketing")
 	q := c.Query("q")
 
 	hotspotIdInt, err := strconv.Atoi(hotspotId)
@@ -265,18 +266,29 @@ func GetUsersExpired(c *gin.Context) {
 
 	// users expired
 	chain := db.Where("hotspot_id in (?) AND valid_until <= NOW()", utils.ExtractHotspotIds(accountId, (accountId == 1), hotspotIdInt))
+
 	if len(accountType) > 0 {
 		chain = chain.Where("account_type = ?", accountType)
 	}
+
+	if len(marketing) > 0 {
+		chain = chain.Where("marketing_auth = 1")
+	}
+
 	chain.Find(&users).Count(&totalUsers)
 	chain.Offset(offsets[0]).Limit(offsets[1]).Find(&users)
 
 	// users history
 	chain = db.Where("hotspot_id in (?)", utils.ExtractHotspotIds(accountId, (accountId == 1), hotspotIdInt))
+
 	if len(accountType) > 0 {
 		chain = chain.Where("account_type = ?", accountType)
 	}
 
+	if len(marketing) > 0 {
+		chain = chain.Where("marketing_auth = 1")
+	}
+
 	if len(q) > 0 {
 		chain = chain.Where("username LIKE ? OR name LIKE ? OR email LIKE ? OR account_type LIKE ? OR kbps_down LIKE ? OR kbps_up LIKE ? OR max_navigation_time LIKE ? OR max_navigation_traffic LIKE ?", "%"+q+"%", "%"+q+"%", "%"+q+"%", "%"+q+"%", "%"+q+"%", "%"+q+"%", "%"+q+"%", "%"+q+"%")
 	}

sun/sun-ui/src/components/Users.vue

@@ -527,15 +527,6 @@ export default {
 
           if (data_export.length < 5000) {
             var usersRows = JSON.parse(JSON.stringify(data_export));
-            for (var r in usersRows) {
-              // get only email verified users
-              if (
-                usersRows[r].account_type == "email" &&
-                !usersRows[r].email_verified
-              ) {
-                delete usersRows[r];
-              }
-            }
 
             var columns = this.columns.slice();