Merge pull request #6 from Intelligent-Systems-Lab/feat/embedded-ees

Feat/embedded ees

Author: hokusai0603

.github/workflows/golangci-lint.yml

@@ -24,7 +24,6 @@ jobs:
         uses: golangci/golangci-lint-action@v9
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          
           version: v2.11.4
 
           # Optional: working directory, useful for monorepos

bin/golangci-lint

@@ -170,7 +170,8 @@ func (aggregator *Aggregator) TickOnce(ctx context.Context) (int, error) {
 		// we MUST send a zero-value report to fulfill the "immediate" requirement
 		// and then delete the subscription.
 		if subscription.Mode == ModeOnDemand && (!hasReports || len(sessionMap) == 0) {
-			aggregator.logger.Infof("ees ONE_TIME subscription %s has no buffered data, sending zero-value report", subscription.ID)
+			aggregator.logger.Infof("ees ONE_TIME subscription %s has no buffered data, "+
+				"sending zero-value report", subscription.ID)
 
 			// Try to find active sessions for this UE to provide at least some identity info
 			zeroReports := aggregator.generateZeroReports(subscription)

internal/ees/aggregator.go

@@ -42,7 +42,12 @@ func TestHandleCreateSubscription(t *testing.T) {
 
 		body, err := json.Marshal(reqBody)
 		require.NoError(t, err)
-		req := httptest.NewRequestWithContext(context.Background(), http.MethodPost, "/nupf-ee/v1/ee-subscriptions", bytes.NewReader(body))
+		req := httptest.NewRequestWithContext(
+			context.Background(),
+			http.MethodPost,
+			"/nupf-ee/v1/ee-subscriptions",
+			bytes.NewReader(body),
+		)
 		rr := httptest.NewRecorder()
 
 		server.handleCreateSubscription(rr, req)
@@ -71,7 +76,12 @@ func TestHandleCreateSubscription(t *testing.T) {
 
 		body, err := json.Marshal(reqBody)
 		require.NoError(t, err)
-		req := httptest.NewRequestWithContext(context.Background(), http.MethodPost, "/nupf-ee/v1/ee-subscriptions", bytes.NewReader(body))
+		req := httptest.NewRequestWithContext(
+			context.Background(),
+			http.MethodPost,
+			"/nupf-ee/v1/ee-subscriptions",
+			bytes.NewReader(body),
+		)
 		rr := httptest.NewRecorder()
 
 		server.handleCreateSubscription(rr, req)
@@ -89,7 +99,12 @@ func TestHandleCreateSubscription(t *testing.T) {
 
 		body, err := json.Marshal(reqBody)
 		require.NoError(t, err)
-		req := httptest.NewRequestWithContext(context.Background(), http.MethodPost, "/nupf-ee/v1/ee-subscriptions", bytes.NewReader(body))
+		req := httptest.NewRequestWithContext(
+			context.Background(),
+			http.MethodPost,
+			"/nupf-ee/v1/ee-subscriptions",
+			bytes.NewReader(body),
+		)
 		rr := httptest.NewRecorder()
 
 		server.handleCreateSubscription(rr, req)
@@ -112,7 +127,12 @@ func TestHandleCreateSubscription(t *testing.T) {
 
 		body, err := json.Marshal(reqBody)
 		require.NoError(t, err)
-		req := httptest.NewRequestWithContext(context.Background(), http.MethodPost, "/nupf-ee/v1/ee-subscriptions", bytes.NewReader(body))
+		req := httptest.NewRequestWithContext(
+			context.Background(),
+			http.MethodPost,
+			"/nupf-ee/v1/ee-subscriptions",
+			bytes.NewReader(body),
+		)
 		rr := httptest.NewRecorder()
 
 		server.handleCreateSubscription(rr, req)
@@ -134,7 +154,12 @@ func TestHandleCreateSubscription(t *testing.T) {
 		id, err := store.CreateSubscription(sub)
 		require.NoError(t, err)
 
-		req := httptest.NewRequestWithContext(context.Background(), http.MethodDelete, "/nupf-ee/v1/ee-subscriptions/"+id, nil)
+		req := httptest.NewRequestWithContext(
+			context.Background(),
+			http.MethodDelete,
+			"/nupf-ee/v1/ee-subscriptions/"+id,
+			nil,
+		)
 		rr := httptest.NewRecorder()
 
 		server.handleDeleteSubscriptionByID(rr, req)
@@ -144,4 +169,3 @@ func TestHandleCreateSubscription(t *testing.T) {
 		assert.False(t, ok)
 	})
 }
-