From b103683feae24d2379f061ae6ee1bccd0725c014 Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Sun, 16 May 2021 23:07:45 +0800
Subject: [PATCH] Refactor GetDefaultApplication().

---
 controllers/application.go | 13 +++++++++++--
 object/application.go      | 11 +++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/controllers/application.go b/controllers/application.go
index a6976bac..0be7f3ab 100644
--- a/controllers/application.go
+++ b/controllers/application.go
@@ -50,9 +50,18 @@ func (c *ApiController) GetApplication() {
 // @Success 200 {object} object.Application The Response object
 // @router /get-default-application [get]
 func (c *ApiController) GetDefaultApplication() {
-	owner := c.Input().Get("owner")
+	//owner := c.Input().Get("owner")
 
-	c.Data["json"] = object.GetDefaultApplication(owner)
+	if c.GetSessionUser() == "" {
+		c.Data["json"] = nil
+		c.ServeJSON()
+		return
+	}
+
+	username := c.GetSessionUser()
+	user := object.GetUser(username)
+
+	c.Data["json"] = object.GetApplicationByUser(user)
 	c.ServeJSON()
 }
 
diff --git a/object/application.go b/object/application.go
index a71f2f76..eb8b9c22 100644
--- a/object/application.go
+++ b/object/application.go
@@ -89,10 +89,9 @@ func getApplication(owner string, name string) *Application {
 	}
 }
 
-func GetDefaultApplication(owner string) *Application {
-	name := "app-built-in"
-	application := Application{Owner: owner, Name: name}
-	existed, err := adapter.Engine.Get(&application)
+func getApplicationByOrganization(organization string) *Application {
+	application := Application{}
+	existed, err := adapter.Engine.Where("organization=?", organization).Get(&application)
 	if err != nil {
 		panic(err)
 	}
@@ -106,6 +105,10 @@ func GetDefaultApplication(owner string) *Application {
 	}
 }
 
+func GetApplicationByUser(user *User) *Application {
+	return getApplicationByOrganization(user.Owner)
+}
+
 func getApplicationByClientId(clientId string) *Application {
 	application := Application{}
 	existed, err := adapter.Engine.Where("client_id=?", clientId).Get(&application)