add: cdr and ue event for multi-tenancy

features/cdr/cdrevent.go

@@ -2,6 +2,7 @@ package cdr
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 	"time"
@@ -212,6 +213,7 @@ type CDREvent struct {
 	RmUID     string         `json:"rmUID" xorm:"rm_uid"`
 	Timestamp int            `json:"timestamp" xorm:"timestamp"`
 	CDR       map[string]any `json:"CDR" xorm:"cdr_json"`
+	TenantID  string         `json:"tenantID" xorm:"tenant_id"`
 }
 
 func PostCDREventFromIMS(w http.ResponseWriter, r *http.Request) {
@@ -234,6 +236,16 @@ func PostCDREventFromIMS(w http.ResponseWriter, r *http.Request) {
 	}
 	log.Trace("cdrEvent:", cdrEvent)
 
+	// for multi-tenancy
+	where := fmt.Sprintf("'%v' like msisdn", cdrEvent.CDR["callerParty"])
+	tenantID, err := dborm.XormGetSingleColStringByWhere("u_sub_user", "tenant_id", where)
+	if err != nil {
+		log.Errorf("failed to get tenant_id:%v", err)
+	}
+	if tenantID != "" {
+		cdrEvent.TenantID = tenantID
+	}
+
 	affected, err := dborm.XormInsertTableOne("cdr_event_ims", cdrEvent)
 	if err != nil && affected <= 0 {
 		log.Error("Failed to insert cdr_event_ims:", err)
@@ -271,6 +283,29 @@ func PostCDREventFromSMF(w http.ResponseWriter, r *http.Request) {
 	}
 	log.Trace("cdrEvent:", cdrEvent)
 
+	cdrJson, err := json.Marshal(cdrEvent.CDR)
+	if err != nil {
+		log.Error("Failed to Marshal cdr:", err)
+		services.ResponseInternalServerError500ProcessError(w, err)
+		return
+	}
+	cdr := new(ChargingRecord)
+	err = json.Unmarshal(cdrJson, &cdr)
+	if err != nil {
+		log.Error("Failed to Unmarshal cdr:", err)
+		services.ResponseInternalServerError500ProcessError(w, err)
+		return
+	}
+	// for multi-tenancy
+	where := fmt.Sprintf("'%v' like imsi or '%v' like msisdn", cdr.SubscriberIdentifier.SubscriptionIDData, cdr.SubscriberIdentifier.SubscriptionIDData)
+	tenantID, err := dborm.XormGetSingleColStringByWhere("u_sub_user", "tenant_id", where)
+	if err != nil {
+		log.Errorf("failed to get tenant_id:%v", err)
+	}
+	if tenantID != "" {
+		cdrEvent.TenantID = tenantID
+	}
+
 	affected, err := dborm.XormInsertTableOne("cdr_event_smf", cdrEvent)
 	if err != nil && affected <= 0 {
 		log.Error("Failed to insert cdr_event_smf:", err)

features/event/event.go

@@ -33,6 +33,7 @@ type UEEvent struct {
 	Timestamp int64          `json:"timestamp" xorm:"timestamp"`
 	EventType string         `json:"eventType" xorm:"event_type"`
 	EventJson map[string]any `json:"eventJSON" xorm:"event_json"`
+	TenantID  string         `json:"tenantID" xorm:"tenant_id"`
 }
 
 func PostUEEventFromAMF(c *gin.Context) {
@@ -64,6 +65,16 @@ func PostUEEventFromAMF(c *gin.Context) {
 	ueEvent.EventType = eventType
 	log.Trace("ueEvent AMF:", ueEvent)
 
+	// for multi-tenancy
+	where := fmt.Sprintf("status='1' and tenancy_type='IMSI' and '%v' like tenancy_key", ueEvent.EventJson["imsi"])
+	tenantID, err := dborm.XormGetSingleColStringByWhere("sys_tenant", "parent_id", where)
+	if err != nil {
+		log.Errorf("failed to get tenant_id:%v", err)
+	}
+	if tenantID != "" {
+		ueEvent.TenantID = tenantID
+	}
+
 	affected, err := dborm.XormInsertTableOne("ue_event_amf", ueEvent)
 	if err != nil && affected <= 0 {
 		log.Error("Failed to insert ue_event_amf:", err)
@@ -87,6 +98,16 @@ func PostUEEvent(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// for multi-tenancy
+	where := fmt.Sprintf("status='1' and tenancy_type='IMSI' and '%v' like tenancy_key", ueEvent.EventJson["imsi"])
+	tenantID, err := dborm.XormGetSingleColStringByWhere("sys_tenant", "parent_id", where)
+	if err != nil {
+		log.Errorf("failed to get tenant_id:%v", err)
+	}
+	if tenantID != "" {
+		ueEvent.TenantID = tenantID
+	}
+
 	ueEvent.NeType = strings.ToUpper(neType)
 	tableName := fmt.Sprintf("ue_event_%s", strings.ToLower(neType))
 	affected, err := dborm.XormInsertTableOne(tableName, ueEvent)

features/udm_user/repo/repo_udm_sub_user.go

@@ -516,7 +516,6 @@ func (r *RepoUdmSubUser) SetTenantName(subArr *[]model.UdmSubUser) {
 }
 
 func (r *RepoUdmSubUser) SetTenantID(subArr *[]model.UdmSubUser) {
-	fmt.Printf("len:%d", len(*subArr))
 	for s := 0; s < len(*subArr); s++ {
 		var tenantID []string
 		err := datasource.DefaultDB().Table("sys_tenant").