From 1f8dba2e82f82f2abf7e897dbcaeedb1660ca8b2 Mon Sep 17 00:00:00 2001
From: Andreas Marschke <andreas.marschke@gmail.com>
Date: Sat, 2 Dec 2023 18:49:53 +0100
Subject: [PATCH] Fix method calls, add is null for globals

---
 api/router.go   |  1 -
 db/sql/SqlDb.go | 45 ++++++++-------------------------------------
 2 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/api/router.go b/api/router.go
index 165cf7560..88e592b1b 100644
--- a/api/router.go
+++ b/api/router.go
@@ -187,7 +187,6 @@ func Route() *mux.Router {
 	projectUserAPI.Path("/webhooks").HandlerFunc(projects.AddWebhook).Methods("POST")
 
 	projectWebhooksAPI := projectUserAPI.PathPrefix("/webhook").Subrouter()
-	projectWebhooksAPI.Use(projects.WebhookMiddleware, projects.MustBeAdmin)
 
 	projectWebhooksAPI.Path("/{webhook_id}").Methods("GET", "HEAD").HandlerFunc(projects.GetWebhook)
 	projectWebhooksAPI.Path("/{webhook_id}").Methods("PUT").HandlerFunc(projects.UpdateWebhook)
diff --git a/db/sql/SqlDb.go b/db/sql/SqlDb.go
index 896e7c86f..51240d1d8 100644
--- a/db/sql/SqlDb.go
+++ b/db/sql/SqlDb.go
@@ -1,3 +1,4 @@
+
 package sql
 
 import (
@@ -207,53 +208,22 @@ func (d *SqlDb) getObjectsByReferrer(referrerID int, referringObjectProps db.Obj
   var referringColumn = referringObjectProps.ReferringColumnSuffix
 
   q := squirrel.Select("*").
-    From(props.TableName+" pe").
-    Where("pe." + referringColumn + "=?", referrerID)
-
-  orderDirection := "ASC"
-  if params.SortInverted {
-    orderDirection = "DESC"
-  }
-
-  orderColumn := props.DefaultSortingColumn
-  if containsStr(props.SortableColumns, params.SortBy) {
-    orderColumn = params.SortBy
-  }
-
-  if orderColumn != "" {
-    q = q.OrderBy("pe." + orderColumn + " " + orderDirection)
-  }
-
-  query, args, err := q.ToSql()
-
-  if err != nil {
-    return
-  }
-
-  _, err = d.selectAll(objects, query, args...)
-
-  return
-}
-
-func (d *SqlDb) getObjects(projectID int, props db.ObjectProps, params db.RetrieveQueryParams, objects interface{}) (err error) {
-  q := squirrel.Select("*").
-      From(props.TableName + " pe")
+	  From(props.TableName+" pe")
 
   if props.IsGlobal {
-      q = q.Where("pe.project_id is null")
+      q = q.Where("pe." + referringColumn + " is null")
   } else {
-      q = q.Where("pe.project_id=?", projectID)
+      q = q.Where("pe." + referringColumn + "=?", referrerID)
   }
-  
-  orderDirection := "ASC"
 
+  orderDirection := "ASC"
   if params.SortInverted {
-      orderDirection = "DESC"
+    orderDirection = "DESC"
   }
 
   orderColumn := props.DefaultSortingColumn
   if containsStr(props.SortableColumns, params.SortBy) {
-      orderColumn = params.SortBy
+    orderColumn = params.SortBy
   }
 
   if orderColumn != "" {
@@ -274,6 +244,7 @@ func (d *SqlDb) getObjects(projectID int, props db.ObjectProps, params db.Retrie
 func (d *SqlDb) getObject(projectID int, props db.ObjectProps,  objectID int, objects interface{}) (err error) {
   return d.getObjectByReferrer(projectID, db.ProjectProps, props, objectID, objects)
 }
+
 func (d *SqlDb) getObjects(projectID int, props db.ObjectProps, params db.RetrieveQueryParams, objects interface{}) (err error) {
   return d.getObjectsByReferrer(projectID, db.ProjectProps, props, params, objects);
 }