fix: fix PR comment

free5gc · Jun 27, 2024 · 972efcf · 972efcf
1 parent 395e622
commit 972efcf
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 34 deletions.
diff --git a/internal/sbi/processor/generate_auth_data.go b/internal/sbi/processor/generate_auth_data.go
@@ -89,7 +89,7 @@ func (p *Processor) ConfirmAuthDataProcedure(c *gin.Context,
 	optInterface := optional.NewInterface(authEvent)
 	createAuthParam.AuthEvent = optInterface
 
-	client, err := p.consumer.CreateUDMClientToUDR(supi)
+	client, err := p.Consumer().CreateUDMClientToUDR(supi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -147,7 +147,7 @@ func (p *Processor) GenerateAuthDataProcedure(
 
 	logger.UeauLog.Tracef("supi conversion => [%s]", supi)
 
-	client, err := p.consumer.CreateUDMClientToUDR(supi)
+	client, err := p.Consumer().CreateUDMClientToUDR(supi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)

diff --git a/internal/sbi/processor/notifier.go b/internal/sbi/processor/notifier.go
@@ -21,7 +21,7 @@ func (p *Processor) DataChangeNotificationProcedure(c *gin.Context,
 
 	ue, _ := p.Context().UdmUeFindBySupi(supi)
 
-	clientAPI := p.consumer.GetSDMClient("DataChangeNotification")
+	clientAPI := p.Consumer().GetSDMClient("DataChangeNotification")
 
 	var problemDetails *models.ProblemDetails
 	for _, subscriptionDataSubscription := range ue.UdmSubsToNotify {
@@ -65,7 +65,7 @@ func (p *Processor) SendOnDeregistrationNotification(ueId string, onDeregistrati
 		return pd
 	}
 
-	clientAPI := p.consumer.GetUECMClient("SendOnDeregistrationNotification")
+	clientAPI := p.Consumer().GetUECMClient("SendOnDeregistrationNotification")
 
 	httpResponse, err := clientAPI.DeregistrationNotificationCallbackApi.DeregistrationNotify(
 		ctx, onDeregistrationNotificationUrl, deregistData)

diff --git a/internal/sbi/processor/parameter_provision.go b/internal/sbi/processor/parameter_provision.go
@@ -19,7 +19,7 @@ func (p *Processor) UpdateProcedure(c *gin.Context,
 		c.JSON(int(pd.Status), pd)
 		return
 	}
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(gpsi)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(gpsi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)

diff --git a/internal/sbi/processor/processor.go b/internal/sbi/processor/processor.go
@@ -13,17 +13,11 @@ type ProcessorUdm interface {
 
 type Processor struct {
 	ProcessorUdm
-	consumer *consumer.Consumer
 }
 
 func NewProcessor(udm ProcessorUdm) (*Processor, error) {
 	p := &Processor{
 		ProcessorUdm: udm,
-		consumer:     udm.Consumer(),
 	}
 	return p, nil
 }
-
-func (p *Processor) Consumer() *consumer.Consumer {
-	return p.consumer
-}
diff --git a/internal/sbi/processor/subscriber_data_management.go b/internal/sbi/processor/subscriber_data_management.go
@@ -23,7 +23,7 @@ func (p *Processor) GetAmDataProcedure(c *gin.Context, supi string, plmnID strin
 	var queryAmDataParamOpts Nudr_DataRepository.QueryAmDataParamOpts
 	queryAmDataParamOpts.SupportedFeatures = optional.NewString(supportedFeatures)
 
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(supi)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(supi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -77,7 +77,7 @@ func (p *Processor) GetIdTranslationResultProcedure(c *gin.Context, gpsi string)
 	var idTranslationResult models.IdTranslationResult
 	var getIdentityDataParamOpts Nudr_DataRepository.GetIdentityDataParamOpts
 
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(gpsi)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(gpsi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -150,7 +150,7 @@ func (p *Processor) GetSupiProcedure(c *gin.Context,
 		return
 	}
 
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(supi)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(supi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -436,7 +436,7 @@ func (p *Processor) GetSharedDataProcedure(c *gin.Context, sharedDataIds []strin
 		c.JSON(int(pd.Status), pd)
 		return
 	}
-	clientAPI, err := p.consumer.CreateUDMClientToUDR("")
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR("")
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -498,7 +498,7 @@ func (p *Processor) GetSmDataProcedure(
 	}
 	logger.SdmLog.Infof("getSmDataProcedure: SUPI[%s] PLMNID[%s] DNN[%s] SNssai[%s]", supi, plmnID, Dnn, Snssai)
 
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(supi)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(supi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -584,7 +584,7 @@ func (p *Processor) GetNssaiProcedure(c *gin.Context, supi string, plmnID string
 	var queryAmDataParamOpts Nudr_DataRepository.QueryAmDataParamOpts
 	queryAmDataParamOpts.SupportedFeatures = optional.NewString(supportedFeatures)
 	var nssaiResp models.Nssai
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(supi)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(supi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -644,7 +644,7 @@ func (p *Processor) GetSmfSelectDataProcedure(c *gin.Context, supi string, plmnI
 	querySmfSelectDataParamOpts.SupportedFeatures = optional.NewString(supportedFeatures)
 	var body models.SmfSelectionSubscriptionData
 
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(supi)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(supi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -703,7 +703,7 @@ func (p *Processor) SubscribeToSharedDataProcedure(c *gin.Context, sdmSubscripti
 		return
 	}
 
-	udmClientAPI := p.consumer.GetSDMClient("subscribeToSharedData")
+	udmClientAPI := p.Consumer().GetSDMClient("subscribeToSharedData")
 
 	sdmSubscriptionResp, res, err := udmClientAPI.SubscriptionCreationForSharedDataApi.SubscribeToSharedData(
 		ctx, *sdmSubscription)
@@ -758,7 +758,7 @@ func (p *Processor) SubscribeProcedure(c *gin.Context, sdmSubscription *models.S
 		c.JSON(int(pd.Status), pd)
 		return
 	}
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(supi)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(supi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -819,7 +819,7 @@ func (p *Processor) UnsubscribeForSharedDataProcedure(c *gin.Context, subscripti
 		return
 	}
 
-	udmClientAPI := p.consumer.GetSDMClient("unsubscribeForSharedData")
+	udmClientAPI := p.Consumer().GetSDMClient("unsubscribeForSharedData")
 
 	res, err := udmClientAPI.SubscriptionDeletionForSharedDataApi.UnsubscribeForSharedData(
 		ctx, subscriptionID)
@@ -862,7 +862,7 @@ func (p *Processor) UnsubscribeProcedure(c *gin.Context, supi string, subscripti
 		c.JSON(int(pd.Status), pd)
 		return
 	}
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(supi)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(supi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -913,7 +913,7 @@ func (p *Processor) ModifyProcedure(c *gin.Context,
 		c.JSON(int(pd.Status), pd)
 		return
 	}
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(supi)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(supi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -972,7 +972,7 @@ func (p *Processor) ModifyForSharedDataProcedure(c *gin.Context,
 		c.JSON(int(pd.Status), pd)
 		return
 	}
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(supi)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(supi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -1028,7 +1028,7 @@ func (p *Processor) GetTraceDataProcedure(c *gin.Context, supi string, plmnID st
 	var body models.TraceData
 	var queryTraceDataParamOpts Nudr_DataRepository.QueryTraceDataParamOpts
 
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(supi)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(supi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -1086,7 +1086,7 @@ func (p *Processor) GetUeContextInSmfDataProcedure(c *gin.Context, supi string,
 	var querySmfRegListParamOpts Nudr_DataRepository.QuerySmfRegListParamOpts
 	querySmfRegListParamOpts.SupportedFeatures = optional.NewString(supportedFeatures)
 
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(supi)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(supi)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)

diff --git a/internal/sbi/processor/ue_context_management.go b/internal/sbi/processor/ue_context_management.go
@@ -24,7 +24,7 @@ func (p *Processor) GetAmf3gppAccessProcedure(c *gin.Context, ueID string, suppo
 	var queryAmfContext3gppParamOpts Nudr_DataRepository.QueryAmfContext3gppParamOpts
 	queryAmfContext3gppParamOpts.SupportedFeatures = optional.NewString(supportedFeatures)
 
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(ueID)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(ueID)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -58,7 +58,7 @@ func (p *Processor) GetAmfNon3gppAccessProcedure(c *gin.Context, queryAmfContext
 	if err != nil {
 		c.JSON(int(pd.Status), pd)
 	}
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(ueID)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(ueID)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -105,7 +105,7 @@ func (p *Processor) RegistrationAmf3gppAccessProcedure(c *gin.Context,
 
 	p.Context().CreateAmf3gppRegContext(ueID, registerRequest)
 
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(ueID)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(ueID)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -185,7 +185,7 @@ func (p *Processor) RegisterAmfNon3gppAccessProcedure(c *gin.Context,
 
 	p.Context().CreateAmfNon3gppRegContext(ueID, registerRequest)
 
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(ueID)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(ueID)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -307,7 +307,7 @@ func (p *Processor) UpdateAmf3gppAccessProcedure(c *gin.Context,
 		patchItemReqArray = append(patchItemReqArray, patchItemTmp)
 	}
 
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(ueID)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(ueID)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -415,7 +415,7 @@ func (p *Processor) UpdateAmfNon3gppAccessProcedure(c *gin.Context,
 		patchItemReqArray = append(patchItemReqArray, patchItemTmp)
 	}
 
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(ueID)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(ueID)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -451,7 +451,7 @@ func (p *Processor) DeregistrationSmfRegistrationsProcedure(c *gin.Context,
 		c.JSON(int(pd.Status), pd)
 		return
 	}
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(ueID)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(ueID)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)
@@ -504,7 +504,7 @@ func (p *Processor) RegistrationSmfRegistrationsProcedure(
 	optInterface := optional.NewInterface(*smfRegistration)
 	createSmfContextNon3gppParamOpts.SmfRegistration = optInterface
 
-	clientAPI, err := p.consumer.CreateUDMClientToUDR(ueID)
+	clientAPI, err := p.Consumer().CreateUDMClientToUDR(ueID)
 	if err != nil {
 		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 		c.JSON(int(problemDetails.Status), problemDetails)