Merge branch 'feat/r17' of https://github.com/KunLee76/nrf into feat/r17

free5gc · Oct 26, 2024 · 03843b9 · 03843b9
2 parents 1746c15 + f1691f8
commit 03843b9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/commit-msg-check.yml b/.github/workflows/commit-msg-check.yml
@@ -1,10 +1,7 @@
 name: 'Commit Message Check'
 
 on:
-  push:
-    branches: [ main ]
   pull_request:
-    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -6,7 +6,6 @@ on:
       - v*
     branches: [ main ]
   pull_request:
-    branches: [ main ]
 
 jobs:
   golangci:

diff --git a/internal/sbi/api_accesstoken.go b/internal/sbi/api_accesstoken.go
@@ -80,7 +80,8 @@ func (s *Server) HTTPAccessTokenRequest(c *gin.Context) {
 				break
 			}
 		}
-		if vt.Name() == "string" || vt.Name() == "NfType" {
+		if vt == reflect.TypeOf("") || vt == reflect.TypeOf(models.NrfNfManagementNfType_NRF) {
+			// Type is string
 			reflect.ValueOf(&accessTokenReq).Elem().FieldByName(name).SetString(value[0])
 		} else {
 			plmnid := models.PlmnId{}

diff --git a/internal/sbi/processor/nf_discovery.go b/internal/sbi/processor/nf_discovery.go
@@ -340,9 +340,10 @@ func buildFilter(queryParameters url.Values) bson.M {
 	// Pattern: '^[A-Fa-f0-9]{6}$'
 	if queryParameters["snssais"] != nil {
 		snssais := queryParameters["snssais"][0]
+		// snssais = [{"sst":1,"sd":"fedcba"}]
 
 		var snssaisBsonArray bson.A
-		slices := util.SnssaisToBsonM(snssais)
+		slices := util.SnssaisToBsonM(snssais[1 : len(snssais)-1])
 		for _, slice := range slices {
 			snssaisBsonArray = append(snssaisBsonArray, bson.M{"sNssais": bson.M{"$elemMatch": slice}})
 		}