From d0289a3243c4f2e6eddd14f7c7cf5d5c8e4b733b Mon Sep 17 00:00:00 2001
From: LXW <1264174498@qq.com>
Date: Thu, 28 Dec 2023 10:05:56 +0800
Subject: [PATCH] (improvement)(headless) Update schema-mysql.sql and
 sql-update.sql (#578)

Co-authored-by: jolunoluo
---
 .../headless/api/model/request/ModelReq.java  | 21 ++++++++++++++-----
 .../src/main/resources/db/schema-mysql.sql    | 14 ++++++-------
 .../src/main/resources/db/sql-update.sql      |  2 +-
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelReq.java
index 81f164c88..de6448bf9 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelReq.java
@@ -8,7 +8,6 @@ import com.tencent.supersonic.headless.api.model.pojo.ModelDetail;
 import com.tencent.supersonic.headless.api.model.pojo.SchemaItem;
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.List;
 
 
@@ -31,13 +30,13 @@ public class ModelReq extends SchemaItem {
 
     private ModelDetail modelDetail;
 
-    private List<String> viewers = new ArrayList<>();
+    private List<String> viewers;
 
-    private List<String> viewOrgs = new ArrayList<>();
+    private List<String> viewOrgs;
 
-    private List<String> admins = new ArrayList<>();
+    private List<String> admins;
 
-    private List<String> adminOrgs = new ArrayList<>();
+    private List<String> adminOrgs;
 
     public List<Dim> getTimeDimension() {
         if (modelDetail == null) {
@@ -47,18 +46,30 @@ public class ModelReq extends SchemaItem {
     }
 
     public String getViewer() {
+        if (viewers == null) {
+            return null;
+        }
         return String.join(",", viewers);
     }
 
     public String getViewOrg() {
+        if (viewOrgs == null) {
+            return null;
+        }
         return String.join(",", viewOrgs);
     }
 
     public String getAdmin() {
+        if (admins == null) {
+            return null;
+        }
         return String.join(",", admins);
     }
 
     public String getAdminOrg() {
+        if (adminOrgs == null) {
+            return null;
+        }
         return String.join(",", adminOrgs);
     }
 
diff --git a/launchers/standalone/src/main/resources/db/schema-mysql.sql b/launchers/standalone/src/main/resources/db/schema-mysql.sql
index 307257005..2dc9b239b 100644
--- a/launchers/standalone/src/main/resources/db/schema-mysql.sql
+++ b/launchers/standalone/src/main/resources/db/schema-mysql.sql
@@ -528,17 +528,17 @@ CREATE TABLE `s2_metric_query_default_config` (
 
 CREATE TABLE `s2_app`
 (
-    id          bigint primary key AUTO_INCREMENT PRIMARY KEY,
+    id          bigint PRIMARY KEY AUTO_INCREMENT,
     name        VARCHAR(255),
     description VARCHAR(255),
     status      INT,
     config      TEXT,
-    end_date    TIMESTAMP,
+    end_date    datetime,
     qps         INT,
     app_secret  VARCHAR(255),
     owner       VARCHAR(255),
-    created_at  TIMESTAMP,
-    created_by  VARCHAR(255),
-    updated_at  TIMESTAMP,
-    updated_by  VARCHAR(255)
-);
\ No newline at end of file
+    `created_at`     datetime null,
+    `updated_at`     datetime null,
+    `created_by`     varchar(255) null,
+    `updated_by`     varchar(255) null
+)ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
\ No newline at end of file
diff --git a/launchers/standalone/src/main/resources/db/sql-update.sql b/launchers/standalone/src/main/resources/db/sql-update.sql
index cd7b5f993..d9aa92d46 100644
--- a/launchers/standalone/src/main/resources/db/sql-update.sql
+++ b/launchers/standalone/src/main/resources/db/sql-update.sql
@@ -150,7 +150,7 @@ alter table s2_model add column `source_type` varchar(128) DEFAULT NULL;
 
 CREATE TABLE `s2_app`
 (
-    id          bigint primary key AUTO_INCREMENT PRIMARY KEY,
+    id          bigint PRIMARY KEY AUTO_INCREMENT,
     name        VARCHAR(255),
     description VARCHAR(255),
     status      INT,