Stats should come after FUP so we can pickup FUP state

lib/smradius/modules/features/mod_feature_user_stats.pm

@@ -149,6 +149,7 @@ sub updateUserStats
 		}
 
 		# Set user FUP state
+		# NK: Perhaps this should be moved to the mod_feature_fup module?
 		my $fupState = $user->{'AttributeConditionalVariables'}->{"SMRadius_FUP"};
 		if (defined($fupState)) {
 			$fupState = $fupState->[0];
@@ -156,7 +157,7 @@ sub updateUserStats
 			$fupState = "-1";
 		}
 		$res = $user->{'_UserDB'}->{'Users_data_set'}($server,$user,
-				'mod_feature_user_stats','FUPState',
+				'mod_feature_fup','State',
 				$fupState
 		);
 		if (!defined($res)) {

smradiusd.conf

@@ -160,10 +160,10 @@ EOT
 [features]
 modules=<<EOT
 mod_feature_capping
-mod_feature_user_stats
-mod_feature_update_user_stats_sql
 mod_feature_validity
 mod_feature_fup
+mod_feature_user_stats
+mod_feature_update_user_stats_sql
 EOT
 
 

t/200-dbtests.t

@@ -877,8 +877,8 @@ if ($child = fork()) {
 			"'14988:Mikrotik-Rate-Limit' is returned on the negative side of the IF");
 
 	testDBResults("Check FUP state was added to the user stats table as 0",'users_data',
-		{'UserID' => $user5_ID,	'Name' => "FUPState"},
-		{'Value' => 0},
+		{'UserID' => $user5_ID,	'Name' => "mod_feature_fup/State"},
+		{'Value' => "0"},
 		1, # Disable order
 	);
 
@@ -951,8 +951,8 @@ if ($child = fork()) {
 			"vendor attribute '14988:Mikrotik-Rate-Limit' is returned on the success side of the FUP check");
 
 	testDBResults("Check FUP state was added to the user stats table as 1",'users_data',
-		{'UserID' => $user6_ID,	'Name' => "FUPState"},
-		{'Value' => 1},
+		{'UserID' => $user6_ID,	'Name' => "mod_feature_fup/State"},
+		{'Value' => "1"},
 		1, # Disable order
 	);