From 9d0fd808e88d0552f0a938fd610001547efa9dcb Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Thu, 4 Jul 2024 10:35:17 +0800
Subject: [PATCH] upgrade table cdr_event and ue_event for multi-tenant

---
 database/install/cdr_event.sql         | 73 +++++++++++---------------
 database/install/cdr_event_ims.sql     | 27 +++++-----
 database/install/cdr_event_smf.sql     | 27 +++++-----
 database/install/ue_event.sql          | 73 +++++++++++---------------
 database/install/ue_event_amf.sql      | 51 ++++++++++++------
 database/install/ue_event_mme.sql      | 51 ++++++++++++------
 database/upgrade/upg_cdr_event.sql     | 14 ++---
 database/upgrade/upg_cdr_event_ims.sql | 27 +++++-----
 database/upgrade/upg_cdr_event_smf.sql | 27 +++++-----
 database/upgrade/upg_ue_event.sql      |  8 +--
 database/upgrade/upg_ue_event_amf.sql  | 27 +++++-----
 database/upgrade/upg_ue_event_mme.sql  | 39 ++++++++++----
 12 files changed, 243 insertions(+), 201 deletions(-)

diff --git a/database/install/cdr_event.sql b/database/install/cdr_event.sql
index 3a1a5a47..2b51b187 100644
--- a/database/install/cdr_event.sql
+++ b/database/install/cdr_event.sql
@@ -1,47 +1,38 @@
--- MariaDB dump 10.19  Distrib 10.6.16-MariaDB, for debian-linux-gnu (x86_64)
---
--- Host: 192.168.2.219    Database: omc_db
--- ------------------------------------------------------
--- Server version	10.3.38-MariaDB
+/*
+ Navicat Premium Data Transfer
 
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8mb4 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+ Source Server         : local_mariadb
+ Source Server Type    : MariaDB
+ Source Server Version : 100338 (10.3.38-MariaDB)
+ Source Host           : localhost:33066
+ Source Schema         : tenants_db
 
---
--- Table structure for table `cdr_event`
---
+ Target Server Type    : MariaDB
+ Target Server Version : 100338 (10.3.38-MariaDB)
+ File Encoding         : 65001
 
+ Date: 04/07/2024 10:28:34
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for cdr_event
+-- ----------------------------
 DROP TABLE IF EXISTS `cdr_event`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `cdr_event` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) DEFAULT NULL,
-  `ne_name` varchar(64) DEFAULT NULL,
-  `rm_uid` varchar(32) DEFAULT NULL,
-  `timestamp` int(11) DEFAULT NULL,
-  `cdr_json` longtext DEFAULT NULL,
-  `created_at` datetime DEFAULT current_timestamp(),
+CREATE TABLE `cdr_event`  (
+  `id` int(11) UNSIGNED ZEROFILL NOT NULL AUTO_INCREMENT,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `timestamp` int(11) NULL DEFAULT NULL,
+  `cdr_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  KEY `id` (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+  INDEX `id`(`id`) USING BTREE,
+  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2024-03-06 17:26:59
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/install/cdr_event_ims.sql b/database/install/cdr_event_ims.sql
index f708f171..347f4f47 100644
--- a/database/install/cdr_event_ims.sql
+++ b/database/install/cdr_event_ims.sql
@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : omc_db
+ Source Schema         : tenants_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 28/05/2024 10:19:12
+ Date: 04/07/2024 10:28:43
 */
 
 SET NAMES utf8mb4;
@@ -21,17 +21,18 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for cdr_event_ims
 -- ----------------------------
 DROP TABLE IF EXISTS `cdr_event_ims`;
-CREATE TABLE `cdr_event_ims` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int DEFAULT NULL,
-  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+CREATE TABLE `cdr_event_ims`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `timestamp` int(11) NULL DEFAULT NULL,
+  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  KEY `id` (`id`) USING BTREE,
-  KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+  INDEX `id`(`id`) USING BTREE,
+  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/install/cdr_event_smf.sql b/database/install/cdr_event_smf.sql
index e0d6a0fb..9ef6622b 100644
--- a/database/install/cdr_event_smf.sql
+++ b/database/install/cdr_event_smf.sql
@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : omc_db
+ Source Schema         : tenants_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 28/05/2024 10:19:23
+ Date: 04/07/2024 10:29:05
 */
 
 SET NAMES utf8mb4;
@@ -21,17 +21,18 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for cdr_event_smf
 -- ----------------------------
 DROP TABLE IF EXISTS `cdr_event_smf`;
-CREATE TABLE `cdr_event_smf` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int DEFAULT NULL,
-  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+CREATE TABLE `cdr_event_smf`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `timestamp` int(11) NULL DEFAULT NULL,
+  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  KEY `id` (`id`) USING BTREE,
-  KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+  INDEX `id`(`id`) USING BTREE,
+  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/install/ue_event.sql b/database/install/ue_event.sql
index 2209c14a..a9209ade 100644
--- a/database/install/ue_event.sql
+++ b/database/install/ue_event.sql
@@ -1,48 +1,39 @@
--- MariaDB dump 10.19  Distrib 10.6.16-MariaDB, for debian-linux-gnu (x86_64)
---
--- Host: 192.168.2.219    Database: omc_db
--- ------------------------------------------------------
--- Server version	10.3.38-MariaDB
+/*
+ Navicat Premium Data Transfer
 
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8mb4 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+ Source Server         : local_mariadb
+ Source Server Type    : MariaDB
+ Source Server Version : 100338 (10.3.38-MariaDB)
+ Source Host           : localhost:33066
+ Source Schema         : tenants_db
 
---
--- Table structure for table `ue_event`
---
+ Target Server Type    : MariaDB
+ Target Server Version : 100338 (10.3.38-MariaDB)
+ File Encoding         : 65001
 
+ Date: 04/07/2024 10:15:55
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for ue_event
+-- ----------------------------
 DROP TABLE IF EXISTS `ue_event`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `ue_event` (
+CREATE TABLE `ue_event`  (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) DEFAULT NULL,
-  `ne_name` varchar(64) DEFAULT NULL,
-  `rm_uid` varchar(32) DEFAULT NULL,
-  `timestamp` int(11) DEFAULT NULL,
-  `event_type` varchar(16) DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
-  `event_json` longtext DEFAULT NULL,
-  `created_at` datetime DEFAULT current_timestamp(),
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `timestamp` int(11) NULL DEFAULT NULL,
+  `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
+  `event_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  KEY `id` (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+  INDEX `id`(`id`) USING BTREE,
+  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `event_type`, `tenant_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2024-03-06 17:26:59
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/install/ue_event_amf.sql b/database/install/ue_event_amf.sql
index a3c09f75..4635d84d 100644
--- a/database/install/ue_event_amf.sql
+++ b/database/install/ue_event_amf.sql
@@ -1,20 +1,39 @@
---
--- Table structure for table `ue_event_amf`
---
+/*
+ Navicat Premium Data Transfer
 
+ Source Server         : local_mariadb
+ Source Server Type    : MariaDB
+ Source Server Version : 100338 (10.3.38-MariaDB)
+ Source Host           : localhost:33066
+ Source Schema         : tenants_db
+
+ Target Server Type    : MariaDB
+ Target Server Version : 100338 (10.3.38-MariaDB)
+ File Encoding         : 65001
+
+ Date: 04/07/2024 10:16:09
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for ue_event_amf
+-- ----------------------------
 DROP TABLE IF EXISTS `ue_event_amf`;
-CREATE TABLE `ue_event_amf` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int DEFAULT NULL,
-  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
-  `event_json` longtext COLLATE utf8mb4_general_ci,
-  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+CREATE TABLE `ue_event_amf`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `timestamp` int(11) NULL DEFAULT NULL,
+  `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
+  `event_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  KEY `id` (`id`) USING BTREE,
-  KEY `idx_type_timestamp` (`ne_type`,`timestamp`,`event_type`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+  INDEX `id`(`id`) USING BTREE,
+  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `event_type`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
--- Dump completed on 2024-03-06 17:26:59
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/install/ue_event_mme.sql b/database/install/ue_event_mme.sql
index 1bf28283..5a534aad 100644
--- a/database/install/ue_event_mme.sql
+++ b/database/install/ue_event_mme.sql
@@ -1,20 +1,39 @@
---
--- Table structure for table `ue_event_mme`
---
+/*
+ Navicat Premium Data Transfer
 
+ Source Server         : local_mariadb
+ Source Server Type    : MariaDB
+ Source Server Version : 100338 (10.3.38-MariaDB)
+ Source Host           : localhost:33066
+ Source Schema         : tenants_db
+
+ Target Server Type    : MariaDB
+ Target Server Version : 100338 (10.3.38-MariaDB)
+ File Encoding         : 65001
+
+ Date: 04/07/2024 10:16:18
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for ue_event_mme
+-- ----------------------------
 DROP TABLE IF EXISTS `ue_event_mme`;
-CREATE TABLE `ue_event_mme` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int DEFAULT NULL,
-  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'ECM STATUS, EMM STATUS',
-  `event_json` longtext COLLATE utf8mb4_general_ci,
-  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+CREATE TABLE `ue_event_mme`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `timestamp` int(11) NULL DEFAULT NULL,
+  `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT 'ECM STATUS, EMM STATUS',
+  `event_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  KEY `id` (`id`) USING BTREE,
-  KEY `idx_type_timestamp` (`ne_type`,`timestamp`,`event_type`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+  INDEX `id`(`id`) USING BTREE,
+  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `event_type`, `tenant_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
--- Dump completed on 2024-06-16 17:26:59
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/upgrade/upg_cdr_event.sql b/database/upgrade/upg_cdr_event.sql
index 58962a6f..d2718277 100644
--- a/database/upgrade/upg_cdr_event.sql
+++ b/database/upgrade/upg_cdr_event.sql
@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : omc_db
+ Source Schema         : tenants_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 19/01/2024 15:57:12
+ Date: 04/07/2024 10:28:34
 */
 
 SET NAMES utf8mb4;
@@ -21,15 +21,17 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for cdr_event
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `cdr_event`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int(11) UNSIGNED ZEROFILL NOT NULL AUTO_INCREMENT,
   `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `timestamp` int(11) NULL DEFAULT NULL,
-  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `cdr_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `created_at` datetime NULL DEFAULT current_timestamp(),
+  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+  INDEX `id`(`id`) USING BTREE,
+  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/upgrade/upg_cdr_event_ims.sql b/database/upgrade/upg_cdr_event_ims.sql
index 236d0cc4..343f4761 100644
--- a/database/upgrade/upg_cdr_event_ims.sql
+++ b/database/upgrade/upg_cdr_event_ims.sql
@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : omc_db
+ Source Schema         : tenants_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 28/05/2024 10:19:12
+ Date: 04/07/2024 10:28:43
 */
 
 SET NAMES utf8mb4;
@@ -21,18 +21,17 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for cdr_event_ims
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `cdr_event_ims`  (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int DEFAULT NULL,
-  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `timestamp` int(11) NULL DEFAULT NULL,
+  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  KEY `id` (`id`) USING BTREE,
-  KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-
-ALTER TABLE `cdr_event_ims` ADD INDEX IF NOT EXISTS `idx_type_timestamp`(`ne_type`, `timestamp`) USING BTREE;
+  INDEX `id`(`id`) USING BTREE,
+  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/upgrade/upg_cdr_event_smf.sql b/database/upgrade/upg_cdr_event_smf.sql
index c4b6870a..dcbe7c93 100644
--- a/database/upgrade/upg_cdr_event_smf.sql
+++ b/database/upgrade/upg_cdr_event_smf.sql
@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : omc_db
+ Source Schema         : tenants_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 28/05/2024 10:19:23
+ Date: 04/07/2024 10:29:05
 */
 
 SET NAMES utf8mb4;
@@ -21,18 +21,17 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for cdr_event_smf
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `cdr_event_smf`  (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int DEFAULT NULL,
-  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `timestamp` int(11) NULL DEFAULT NULL,
+  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  KEY `id` (`id`) USING BTREE,
-  KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-
-ALTER TABLE `cdr_event_smf` ADD INDEX IF NOT EXISTS `idx_type_timestamp`(`ne_type`, `timestamp`) USING BTREE;
+  INDEX `id`(`id`) USING BTREE,
+  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/upgrade/upg_ue_event.sql b/database/upgrade/upg_ue_event.sql
index b60f7382..45397fb4 100644
--- a/database/upgrade/upg_ue_event.sql
+++ b/database/upgrade/upg_ue_event.sql
@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : omc_db
+ Source Schema         : tenants_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 22/01/2024 17:03:39
+ Date: 04/07/2024 10:15:55
 */
 
 SET NAMES utf8mb4;
@@ -29,8 +29,10 @@ CREATE TABLE IF NOT EXISTS `ue_event`  (
   `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
   `event_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `created_at` datetime NULL DEFAULT current_timestamp(),
+  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE
+  INDEX `id`(`id`) USING BTREE,
+  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `event_type`, `tenant_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/upgrade/upg_ue_event_amf.sql b/database/upgrade/upg_ue_event_amf.sql
index 7eebce3e..cbbadf32 100644
--- a/database/upgrade/upg_ue_event_amf.sql
+++ b/database/upgrade/upg_ue_event_amf.sql
@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : omc_db
+ Source Schema         : tenants_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 22/01/2024 17:03:39
+ Date: 04/07/2024 10:16:09
 */
 
 SET NAMES utf8mb4;
@@ -21,17 +21,18 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for ue_event_amf
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `ue_event_amf`  (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int DEFAULT NULL,
-  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
-  `event_json` longtext COLLATE utf8mb4_general_ci,
-  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `timestamp` int(11) NULL DEFAULT NULL,
+  `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
+  `event_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  KEY `id` (`id`) USING BTREE,
-  KEY `idx_type_timestamp` (`ne_type`,`timestamp`,`event_type`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+  INDEX `id`(`id`) USING BTREE,
+  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `event_type`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/upgrade/upg_ue_event_mme.sql b/database/upgrade/upg_ue_event_mme.sql
index f9d3b1b2..9475abc4 100644
--- a/database/upgrade/upg_ue_event_mme.sql
+++ b/database/upgrade/upg_ue_event_mme.sql
@@ -1,3 +1,19 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : local_mariadb
+ Source Server Type    : MariaDB
+ Source Server Version : 100338 (10.3.38-MariaDB)
+ Source Host           : localhost:33066
+ Source Schema         : tenants_db
+
+ Target Server Type    : MariaDB
+ Target Server Version : 100338 (10.3.38-MariaDB)
+ File Encoding         : 65001
+
+ Date: 04/07/2024 10:16:18
+*/
+
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
@@ -5,17 +21,18 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for ue_event_mme
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `ue_event_mme`  (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int DEFAULT NULL,
-  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'ECM STATUS, EMM STATUS',
-  `event_json` longtext COLLATE utf8mb4_general_ci,
-  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `timestamp` int(11) NULL DEFAULT NULL,
+  `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT 'ECM STATUS, EMM STATUS',
+  `event_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  KEY `id` (`id`) USING BTREE,
-  KEY `idx_type_timestamp` (`ne_type`,`timestamp`,`event_type`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+  INDEX `id`(`id`) USING BTREE,
+  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `event_type`, `tenant_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;