sort flow level charging record

free5gc · Dec 15, 2023 · 2cb4f1c · 2cb4f1c
1 parent 28b0587
commit 2cb4f1c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/backend/WebUI/api_webui.go b/backend/WebUI/api_webui.go
@@ -2057,6 +2057,7 @@ func GetChargingRecord(c *gin.Context) {
 		}
 
 		// Flow's Tol, Dl, Ul volume add back to PDU Session Level
+		// TODO: O(n^2) too slow
 		for _, du := range ratingGroupDataUsages {
 			if du.Filter != "" && du.Dnn != "" {
 				addVolumeToPduLevelDataUsage(ratingGroupDataUsages, du)
@@ -2076,8 +2077,10 @@ func addVolumeToPduLevelDataUsage(ratingGroupDataUsages map[int64]RatingGroupDat
 			du.DlVol += flow_du.DlVol
 			du.UlVol += flow_du.UlVol
 			ratingGroupDataUsages[rg] = du
+			break
 		}
 	}
+
 	if !found {
 		filter := bson.M{"filter": "", "dnn": "", "snssai": flow_du.Snssai, "ueId": flow_du.Supi}
 		chargingDataInterface, err := mongoapi.RestfulAPIGetOne(chargingDataColl, filter)
@@ -2086,8 +2089,7 @@ func addVolumeToPduLevelDataUsage(ratingGroupDataUsages map[int64]RatingGroupDat
 		}
 
 		var chargingData ChargingData
-		err = json.Unmarshal(mapToByte(chargingDataInterface), &chargingData)
-		if err != nil {
+		if json.Unmarshal(mapToByte(chargingDataInterface), &chargingData) != nil {
 			logger.BillingLog.Error(err)
 		}
 
@@ -2100,6 +2102,7 @@ func addVolumeToPduLevelDataUsage(ratingGroupDataUsages map[int64]RatingGroupDat
 		if err != nil {
 			logger.BillingLog.Errorf("Quota convert error, supi: %s, flow: %s", flow_du.Supi, flow_du.Filter)
 		}
+
 		ratingGroupDataUsages[chargingData.RatingGroup] = RatingGroupDataUsage{
 			Supi:      flow_du.Supi,
 			Filter:    "",

diff --git a/frontend/src/pages/ChargingRecordList.tsx b/frontend/src/pages/ChargingRecordList.tsx
@@ -59,7 +59,9 @@ export default function ChargingRecordList() {
   /* eslint-disable react/prop-types */
   const PerFlowTableView = ({ Supi, Snssai }: Props): React.ReactElement => (
     <>
-      {expand === true ? cr.filter((a) => a!.Filter !== "" && a!.Dnn! !== "" && a!.Supi === Supi && a!.Snssai === Snssai).sort((a,b) => a!.Filter! > b!.Filter! ? 1 : -1).map((row, index) => (
+      {expand === true ? cr.filter((a) => a!.Filter !== "" && a!.Dnn! !== "" && a!.Supi === Supi && a!.Snssai === Snssai)
+                              .sort((a,b) => a!.Filter! > b!.Filter! ? 1 : -1)
+                                  .map((row, index) => (
             <TableRow key={index}>
               <TableCell>{}</TableCell>
               <TableCell>{row.Snssai}</TableCell>