From d6d3450548d3405158d47c4b53b5b220fb0bbbfb Mon Sep 17 00:00:00 2001
From: Jannis Metrikat <120120832+jmetrikat@users.noreply.github.com>
Date: Thu, 16 Jan 2025 00:50:39 +0100
Subject: [PATCH] GO-4459: Fix bugs

---
 cmd/grpcserver/grpc.go              |  4 +---
 core/api/server/middleware.go       |  1 -
 core/api/services/object/service.go | 32 ++++++++++++++---------------
 core/api/services/search/service.go |  6 +++---
 core/api/services/space/service.go  |  6 ------
 core/api/util/util.go               |  1 +
 6 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/cmd/grpcserver/grpc.go b/cmd/grpcserver/grpc.go
index d9e421a98..827fd3c39 100644
--- a/cmd/grpcserver/grpc.go
+++ b/cmd/grpcserver/grpc.go
@@ -226,6 +226,7 @@ func main() {
 	}()
 
 	startReportMemory(mw)
+	api.SetMiddlewareParams(mw)
 
 	shutdown := func() {
 		server.Stop()
@@ -247,9 +248,6 @@ func main() {
 		}
 	}
 
-	// pass mw to api service
-	api.SetMiddlewareParams(mw)
-
 	for {
 		sig := <-signalChan
 		if shouldSaveStack(sig) {
diff --git a/core/api/server/middleware.go b/core/api/server/middleware.go
index 6f0273545..bc8cb7312 100644
--- a/core/api/server/middleware.go
+++ b/core/api/server/middleware.go
@@ -48,7 +48,6 @@ func (s *Server) ensureAuthenticated() gin.HandlerFunc {
 // ensureAccountInfo is a middleware that ensures the account info is available in the services.
 func (s *Server) ensureAccountInfo(a *app.App) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		// TODO: consider not fetching account info on every request; currently used to avoid inconsistencies on logout/login
 		if a == nil {
 			c.AbortWithStatusJSON(http.StatusForbidden, gin.H{"error": "failed to get app instance"})
 			return
diff --git a/core/api/services/object/service.go b/core/api/services/object/service.go
index a0214f834..ecffe4dc5 100644
--- a/core/api/services/object/service.go
+++ b/core/api/services/object/service.go
@@ -412,31 +412,29 @@ func (s *ObjectService) GetDetails(resp *pb.RpcObjectShowResponse) []Detail {
 
 	return []Detail{
 		{
-			Id: "lastModifiedDate",
+			Id: "last_modified_date",
 			Details: map[string]interface{}{
-				"lastModifiedDate": PosixToISO8601(resp.ObjectView.Details[0].Details.Fields[bundle.RelationKeyLastModifiedDate.String()].GetNumberValue()),
+				"last_modified_date": PosixToISO8601(resp.ObjectView.Details[0].Details.Fields[bundle.RelationKeyLastModifiedDate.String()].GetNumberValue()),
 			},
 		},
 		{
-			Id: "createdDate",
+			Id: "last_modified_by",
 			Details: map[string]interface{}{
-				"createdDate": PosixToISO8601(resp.ObjectView.Details[0].Details.Fields[bundle.RelationKeyCreatedDate.String()].GetNumberValue()),
-			},
-		},
-		{
-			Id: "createdBy",
-			Details: map[string]interface{}{
-				"id":      creatorId,
-				"details": s.spaceService.GetParticipantDetails(s.mw, s.AccountInfo, resp.ObjectView.Details[0].Details.Fields[bundle.RelationKeySpaceId.String()].GetStringValue(), creatorId),
-			},
-		},
-		{
-			Id: "lastModifiedBy",
-			Details: map[string]interface{}{
-				"id":      lastModifiedById,
 				"details": s.spaceService.GetParticipantDetails(s.mw, s.AccountInfo, resp.ObjectView.Details[0].Details.Fields[bundle.RelationKeySpaceId.String()].GetStringValue(), lastModifiedById),
 			},
 		},
+		{
+			Id: "created_date",
+			Details: map[string]interface{}{
+				"created_date": PosixToISO8601(resp.ObjectView.Details[0].Details.Fields[bundle.RelationKeyCreatedDate.String()].GetNumberValue()),
+			},
+		},
+		{
+			Id: "created_by",
+			Details: map[string]interface{}{
+				"details": s.spaceService.GetParticipantDetails(s.mw, s.AccountInfo, resp.ObjectView.Details[0].Details.Fields[bundle.RelationKeySpaceId.String()].GetStringValue(), creatorId),
+			},
+		},
 		{
 			Id: "tags",
 			Details: map[string]interface{}{
diff --git a/core/api/services/search/service.go b/core/api/services/search/service.go
index 41db34632..8186758f6 100644
--- a/core/api/services/search/service.go
+++ b/core/api/services/search/service.go
@@ -88,10 +88,10 @@ func (s *SearchService) Search(ctx context.Context, searchQuery string, objectTy
 		return nil, 0, false, ErrNoObjectsFound
 	}
 
-	// sort after ISO 8601 lastModifiedDate to achieve descending sort order across all spaces
+	// sort after ISO 8601 last_modified_date to achieve descending sort order across all spaces
 	sort.Slice(results, func(i, j int) bool {
-		dateStrI := results[i].Details[0].Details["lastModifiedDate"].(string)
-		dateStrJ := results[j].Details[0].Details["lastModifiedDate"].(string)
+		dateStrI := results[i].Details[0].Details["last_modified_date"].(string)
+		dateStrJ := results[j].Details[0].Details["last_modified_date"].(string)
 		return dateStrI > dateStrJ
 	})
 
diff --git a/core/api/services/space/service.go b/core/api/services/space/service.go
index fef990bdd..f67cc2df2 100644
--- a/core/api/services/space/service.go
+++ b/core/api/services/space/service.go
@@ -60,12 +60,6 @@ func (s *SpaceService) ListSpaces(ctx context.Context, offset int, limit int) (s
 				Condition:   model.BlockContentDataviewFilter_Equal,
 				Value:       pbtypes.Int64(int64(model.SpaceStatus_Ok)),
 			},
-			{
-				Operator:    model.BlockContentDataviewFilter_No,
-				RelationKey: bundle.RelationKeySpaceRemoteStatus.String(),
-				Condition:   model.BlockContentDataviewFilter_Equal,
-				Value:       pbtypes.Int64(int64(model.SpaceStatus_Ok)),
-			},
 		},
 		Sorts: []*model.BlockContentDataviewSort{
 			{
diff --git a/core/api/util/util.go b/core/api/util/util.go
index 5f0cd0742..6c5a74eb9 100644
--- a/core/api/util/util.go
+++ b/core/api/util/util.go
@@ -44,6 +44,7 @@ func ResolveTypeToName(mw service.ClientCommandsServer, spaceId string, typeId s
 		SpaceId: spaceId,
 		Filters: []*model.BlockContentDataviewFilter{
 			{
+				Operator:    model.BlockContentDataviewFilter_No,
 				RelationKey: relKey,
 				Condition:   model.BlockContentDataviewFilter_Equal,
 				Value:       pbtypes.String(typeId),