Multifrontend Support

backend/database/repositories/filesystem.go

@@ -13,9 +13,6 @@ type filesystemRepository struct {
 	embeddedContext
 }
 
-// The ID for root, set this as the ID in a specified request
-var FilesystemRootID uuid.UUID = uuid.Nil
-
 // We really should use an ORM jesus this is ugly
 func (rep filesystemRepository) query(query string, input ...interface{}) (FilesystemEntry, error) {
 	entity := FilesystemEntry{}
@@ -51,15 +48,16 @@ func (rep filesystemRepository) query(query string, input ...interface{}) (Files
 
 // Returns: entry struct containing the entity that was just created
 func (rep filesystemRepository) CreateEntry(file FilesystemEntry) (FilesystemEntry, error) {
-	if file.ParentFileID == FilesystemRootID {
-		// determine root ID
-		root, err := rep.GetRoot()
-		if err != nil {
-			return FilesystemEntry{}, errors.New("failed to get root")
-		}
+	// TODO: I feel like this is useless?
+	// if file.ParentFileID == FilesystemRootID {
+	// 	// determine root ID
+	// 	root, err := rep.GetRoot()
+	// 	if err != nil {
+	// 		return FilesystemEntry{}, errors.New("failed to get root")
+	// 	}
 
-		file.ParentFileID = root.EntityID
-	}
+	// 	file.ParentFileID = root.EntityID
+	// }
 
 	var newID uuid.UUID
 	err := rep.ctx.Query("SELECT new_entity($1, $2, $3, $4)", []interface{}{file.ParentFileID, file.LogicalName, file.OwnerUserId, file.IsDocument}, &newID)
@@ -69,18 +67,15 @@ func (rep filesystemRepository) CreateEntry(file FilesystemEntry) (FilesystemEnt
 	return rep.GetEntryWithID(newID)
 }
 
+// TODO: Change this
 func (rep filesystemRepository) GetEntryWithID(ID uuid.UUID) (FilesystemEntry, error) {
-	if ID == FilesystemRootID {
-		return rep.GetRoot()
-	}
-
 	result, err := rep.query("SELECT * FROM filesystem WHERE EntityID = $1", ID)
 	return result, err
 }
 
-func (rep filesystemRepository) GetRoot() (FilesystemEntry, error) {
-	// Root is currently set to ID 1
-	return rep.query("SELECT * FROM filesystem WHERE EntityID = $1", FilesystemRootID)
+// TODO: Is this even necessary anymore? frontend table's GetIDWithName does same thing
+func (rep filesystemRepository) GetRoot(frontend string) (FilesystemEntry, error) {
+	return rep.query("SELECT * FROM frontend WHERE FrontendLogicalname = $1", frontend)
 }
 
 func (rep filesystemRepository) GetEntryWithParentID(ID uuid.UUID) (FilesystemEntry, error) {

backend/database/repositories/frontends.go

@@ -1,18 +1,30 @@
 package repositories
 
+import "github.com/google/uuid"
+
 type frontendsRepository struct {
 	embeddedContext
 }
 
-const InvalidFrontend = -1
+var InvalidFrontend = uuid.Nil
 
 // GetFrontendFromURL is the implementation of the frontend repository for frontendRepository
-func (rep frontendsRepository) GetFrontendFromURL(url string) int {
-	var frontendId int
-	err := rep.ctx.Query("SELECT FrontendId from frontend where FrontendUrl = $1;", []interface{}{url}, &frontendId)
+func (rep frontendsRepository) GetFrontendFromURL(url string) (uuid.UUID, error) {
+	var frontendId uuid.UUID
+	err := rep.ctx.Query("SELECT FrontendID from frontend where FrontendUrl = $1;", []interface{}{url}, &frontendId)
 	if err != nil {
-		return InvalidFrontend
+		return InvalidFrontend, err
 	}
 
-	return frontendId
+	return frontendId, nil
+}
+
+// Get FrontendID (uuid) with logical name
+func (rep frontendsRepository) GetIDWithName(name string) (uuid.UUID, error) {
+	var frontendId uuid.UUID
+	err := rep.ctx.Query("SELECT FrontendID from frontend where FrontendLogicalName = $1;", []interface{}{name}, &frontendId)
+	if err != nil {
+		return InvalidFrontend, err
+	}
+	return frontendId, nil
 }

backend/database/repositories/main.go

@@ -4,6 +4,7 @@ import (
 	"sync"
 
 	"cms.csesoc.unsw.edu.au/database/contexts"
+	"github.com/google/uuid"
 )
 
 // Start up a database connection with a provided context
@@ -36,7 +37,7 @@ func NewFrontendsRepo() FrontendsRepository {
 }
 
 // NewPersonRepo instantiates a new person repository
-func NewPersonRepo(frontendId int) PersonRepository {
+func NewPersonRepo(frontendId uuid.UUID) PersonRepository {
 	return personRepository{
 		frontendId,
 		embeddedContext{getContext()},

backend/database/repositories/person.go

@@ -6,11 +6,13 @@ package repositories
 
 import (
 	"log"
+
+	"github.com/google/uuid"
 )
 
 // Implements IPersonRepository
 type personRepository struct {
-	frontEndID int
+	frontEndID uuid.UUID
 	embeddedContext
 }
 

backend/database/repositories/repository_interfaces.go

@@ -29,7 +29,7 @@ type (
 	// mocked/real should implement
 	FilesystemRepository interface {
 		GetEntryWithID(ID uuid.UUID) (FilesystemEntry, error)
-		GetRoot() (FilesystemEntry, error)
+		GetRoot(frontend string) (FilesystemEntry, error)
 		GetEntryWithParentID(ID uuid.UUID) (FilesystemEntry, error)
 		GetIDWithPath(path string) (uuid.UUID, error)
 
@@ -72,7 +72,8 @@ type (
 
 	// repository interface for getting information from the frontend table
 	FrontendsRepository interface {
-		GetFrontendFromURL(url string) int
+		GetIDWithName(name string) (uuid.UUID, error)
+		GetFrontendFromURL(url string) (uuid.UUID, error)
 	}
 )