pk/cosmium
1
0
Fork 0
mirror of https://github.com/pikami/cosmium.git synced 2025-12-19 08:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move out repository models; Hidrate collection on create

Browse Source
This commit is contained in:
Pijus Kamandulis
2024-02-12 21:38:03 +02:00
parent 88526dcdcc
commit 9c56d01d27
23 changed files with 372 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
api/handlers/collections.go
View File

@@ -5,13 +5,14 @@ import (
"github.com/gin-gonic/gin"
"github.com/pikami/cosmium/internal/repositories"
repositorymodels "github.com/pikami/cosmium/internal/repository_models"
)
func GetAllCollections(c *gin.Context) {
databaseId := c.Param("databaseId")
collections, status := repositories.GetAllCollections(databaseId)
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.IndentedJSON(http.StatusOK, gin.H{"_rid": "", "DocumentCollections": collections, "_count": len(collections)})
return
}
@@ -24,12 +25,12 @@ func GetCollection(c *gin.Context) {
id := c.Param("collId")
collection, status := repositories.GetCollection(databaseId, id)
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.IndentedJSON(http.StatusOK, collection)
return
}
if status == repositories.StatusNotFound {
if status == repositorymodels.StatusNotFound {
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
return
}
@@ -42,12 +43,12 @@ func DeleteCollection(c *gin.Context) {
id := c.Param("collId")
status := repositories.DeleteCollection(databaseId, id)
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.Status(http.StatusNoContent)
return
}
if status == repositories.StatusNotFound {
if status == repositorymodels.StatusNotFound {
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
return
}
@@ -57,7 +58,7 @@ func DeleteCollection(c *gin.Context) {
func CreateCollection(c *gin.Context) {
databaseId := c.Param("databaseId")
var newCollection repositories.Collection
var newCollection repositorymodels.Collection
if err := c.BindJSON(&newCollection); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"message": err.Error()})
@@ -69,14 +70,14 @@ func CreateCollection(c *gin.Context) {
return
}
status := repositories.CreateCollection(databaseId, newCollection)
if status == repositories.Conflict {
createdCollection, status := repositories.CreateCollection(databaseId, newCollection)
if status == repositorymodels.Conflict {
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
return
}
if status == repositories.StatusOk {
c.IndentedJSON(http.StatusCreated, newCollection)
if status == repositorymodels.StatusOk {
c.IndentedJSON(http.StatusCreated, createdCollection)
return
}

17
api/handlers/databases.go
View File

@@ -5,11 +5,12 @@ import (
"github.com/gin-gonic/gin"
"github.com/pikami/cosmium/internal/repositories"
repositorymodels "github.com/pikami/cosmium/internal/repository_models"
)
func GetAllDatabases(c *gin.Context) {
databases, status := repositories.GetAllDatabases()
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.IndentedJSON(http.StatusOK, gin.H{"_rid": "", "Databases": databases, "_count": len(databases)})
return
}
@@ -21,12 +22,12 @@ func GetDatabase(c *gin.Context) {
id := c.Param("databaseId")
database, status := repositories.GetDatabase(id)
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.IndentedJSON(http.StatusOK, database)
return
}
if status == repositories.StatusNotFound {
if status == repositorymodels.StatusNotFound {
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
return
}
@@ -38,12 +39,12 @@ func DeleteDatabase(c *gin.Context) {
id := c.Param("databaseId")
status := repositories.DeleteDatabase(id)
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.Status(http.StatusNoContent)
return
}
if status == repositories.StatusNotFound {
if status == repositorymodels.StatusNotFound {
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
return
}
@@ -52,7 +53,7 @@ func DeleteDatabase(c *gin.Context) {
}
func CreateDatabase(c *gin.Context) {
var newDatabase repositories.Database
var newDatabase repositorymodels.Database
if err := c.BindJSON(&newDatabase); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"message": err.Error()})
@@ -65,12 +66,12 @@ func CreateDatabase(c *gin.Context) {
}
status := repositories.CreateDatabase(newDatabase)
if status == repositories.Conflict {
if status == repositorymodels.Conflict {
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
return
}
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.IndentedJSON(http.StatusCreated, newDatabase)
return
}

17
api/handlers/documents.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/pikami/cosmium/internal/constants"
"github.com/pikami/cosmium/internal/repositories"
repositorymodels "github.com/pikami/cosmium/internal/repository_models"
)
func GetAllDocuments(c *gin.Context) {
@@ -13,7 +14,7 @@ func GetAllDocuments(c *gin.Context) {
collectionId := c.Param("collId")
documents, status := repositories.GetAllDocuments(databaseId, collectionId)
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.IndentedJSON(http.StatusOK, gin.H{"_rid": "", "Documents": documents, "_count": len(documents)})
return
}
@@ -27,12 +28,12 @@ func GetDocument(c *gin.Context) {
documentId := c.Param("docId")
document, status := repositories.GetDocument(databaseId, collectionId, documentId)
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.IndentedJSON(http.StatusOK, document)
return
}
if status == repositories.StatusNotFound {
if status == repositorymodels.StatusNotFound {
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
return
}
@@ -46,12 +47,12 @@ func DeleteDocument(c *gin.Context) {
documentId := c.Param("docId")
status := repositories.DeleteDocument(databaseId, collectionId, documentId)
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.Status(http.StatusNoContent)
return
}
if status == repositories.StatusNotFound {
if status == repositorymodels.StatusNotFound {
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
return
}
@@ -78,7 +79,7 @@ func DocumentsPost(c *gin.Context) {
// TODO: Handle these {"query":"select c.id, c._self, c._rid, c._ts, [c[\"pk\"]] as _partitionKeyValue from c"}
docs, status := repositories.ExecuteQueryDocuments(databaseId, collectionId, query.(string))
if status != repositories.StatusOk {
if status != repositorymodels.StatusOk {
// TODO: Currently we return everything if the query fails
GetAllDocuments(c)
return
@@ -94,12 +95,12 @@ func DocumentsPost(c *gin.Context) {
}
status := repositories.CreateDocument(databaseId, collectionId, requestBody)
if status == repositories.Conflict {
if status == repositorymodels.Conflict {
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
return
}
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.IndentedJSON(http.StatusCreated, requestBody)
return
}

30
api/handlers/middleware/loggers.go Normal file
View File

@@ -0,0 +1,30 @@
package middleware
import (
"bytes"
"fmt"
"io"
"github.com/gin-gonic/gin"
)
func RequestLogger() gin.HandlerFunc {
return func(c *gin.Context) {
buf, _ := io.ReadAll(c.Request.Body)
rdr1 := io.NopCloser(bytes.NewBuffer(buf))
rdr2 := io.NopCloser(bytes.NewBuffer(buf))
fmt.Println(readBody(rdr1))
c.Request.Body = rdr2
c.Next()
}
}
func readBody(reader io.Reader) string {
buf := new(bytes.Buffer)
buf.ReadFrom(reader)
s := buf.String()
return s
}

5
api/handlers/partition_key_ranges.go
View File

@@ -5,6 +5,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/pikami/cosmium/internal/repositories"
repositorymodels "github.com/pikami/cosmium/internal/repository_models"
)
func GetPartitionKeyRanges(c *gin.Context) {
@@ -12,7 +13,7 @@ func GetPartitionKeyRanges(c *gin.Context) {
collectionId := c.Param("collId")
partitionKeyRanges, status := repositories.GetPartitionKeyRanges(databaseId, collectionId)
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.IndentedJSON(http.StatusOK, gin.H{
"_rid": "",
"_count": len(partitionKeyRanges),
@@ -21,7 +22,7 @@ func GetPartitionKeyRanges(c *gin.Context) {
return
}
if status == repositories.StatusNotFound {
if status == repositorymodels.StatusNotFound {
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
return
}

3
api/handlers/stored_procedures.go
View File

@@ -5,6 +5,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/pikami/cosmium/internal/repositories"
repositorymodels "github.com/pikami/cosmium/internal/repository_models"
)
func GetAllStoredProcedures(c *gin.Context) {
@@ -13,7 +14,7 @@ func GetAllStoredProcedures(c *gin.Context) {
sps, status := repositories.GetAllStoredProcedures(databaseId, collectionId)
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.IndentedJSON(http.StatusOK, gin.H{"_rid": "", "StoredProcedures": sps, "_count": len(sps)})
return
}

3
api/handlers/triggers.go
View File

@@ -5,6 +5,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/pikami/cosmium/internal/repositories"
repositorymodels "github.com/pikami/cosmium/internal/repository_models"
)
func GetAllTriggers(c *gin.Context) {
@@ -13,7 +14,7 @@ func GetAllTriggers(c *gin.Context) {
triggers, status := repositories.GetAllTriggers(databaseId, collectionId)
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.IndentedJSON(http.StatusOK, gin.H{"_rid": "", "Triggers": triggers, "_count": len(triggers)})
return
}

3
api/handlers/user_defined_functions.go
View File

@@ -5,6 +5,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/pikami/cosmium/internal/repositories"
repositorymodels "github.com/pikami/cosmium/internal/repository_models"
)
func GetAllUserDefinedFunctions(c *gin.Context) {
@@ -13,7 +14,7 @@ func GetAllUserDefinedFunctions(c *gin.Context) {
udfs, status := repositories.GetAllUserDefinedFunctions(databaseId, collectionId)
if status == repositories.StatusOk {
if status == repositorymodels.StatusOk {
c.IndentedJSON(http.StatusOK, gin.H{"_rid": "", "UserDefinedFunctions": udfs, "_count": len(udfs)})
return
}

3
api/router.go
View File

@@ -3,11 +3,14 @@ package api
import (
"github.com/gin-gonic/gin"
"github.com/pikami/cosmium/api/handlers"
"github.com/pikami/cosmium/api/handlers/middleware"
)
func CreateRouter() *gin.Engine {
router := gin.Default()
router.Use(middleware.RequestLogger())
router.GET("/dbs/:databaseId/colls/:collId/pkranges", handlers.GetPartitionKeyRanges)
router.POST("/dbs/:databaseId/colls/:collId/docs", handlers.DocumentsPost)

7
api/tests/collections_test.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
"github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos"
"github.com/pikami/cosmium/internal/repositories"
repositorymodels "github.com/pikami/cosmium/internal/repository_models"
"github.com/stretchr/testify/assert"
)
@@ -37,7 +38,7 @@ func Test_Collections(t *testing.T) {
})
t.Run("Should return conflict when collection exists", func(t *testing.T) {
repositories.CreateCollection(testDatabaseName, repositories.Collection{
repositories.CreateCollection(testDatabaseName, repositorymodels.Collection{
ID: testCollectionName,
})
@@ -57,7 +58,7 @@ func Test_Collections(t *testing.T) {
t.Run("Collection Read", func(t *testing.T) {
t.Run("Should read collection", func(t *testing.T) {
repositories.CreateCollection(testDatabaseName, repositories.Collection{
repositories.CreateCollection(testDatabaseName, repositorymodels.Collection{
ID: testCollectionName,
})
@@ -90,7 +91,7 @@ func Test_Collections(t *testing.T) {
t.Run("Collection Delete", func(t *testing.T) {
t.Run("Should delete collection", func(t *testing.T) {
repositories.CreateCollection(testDatabaseName, repositories.Collection{
repositories.CreateCollection(testDatabaseName, repositorymodels.Collection{
ID: testCollectionName,
})

7
api/tests/databases_test.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
"github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos"
"github.com/pikami/cosmium/internal/repositories"
repositorymodels "github.com/pikami/cosmium/internal/repository_models"
"github.com/stretchr/testify/assert"
)
@@ -34,7 +35,7 @@ func Test_Databases(t *testing.T) {
})
t.Run("Should return conflict when database exists", func(t *testing.T) {
repositories.CreateDatabase(repositories.Database{
repositories.CreateDatabase(repositorymodels.Database{
ID: testDatabaseName,
})
@@ -54,7 +55,7 @@ func Test_Databases(t *testing.T) {
t.Run("Database Read", func(t *testing.T) {
t.Run("Should read database", func(t *testing.T) {
repositories.CreateDatabase(repositories.Database{
repositories.CreateDatabase(repositorymodels.Database{
ID: testDatabaseName,
})
@@ -87,7 +88,7 @@ func Test_Databases(t *testing.T) {
t.Run("Database Delete", func(t *testing.T) {
t.Run("Should delete database", func(t *testing.T) {
repositories.CreateDatabase(repositories.Database{
repositories.CreateDatabase(repositorymodels.Database{
ID: testDatabaseName,
})

3
api/tests/documents_test.go
View File

@@ -9,6 +9,7 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos"
"github.com/pikami/cosmium/internal/repositories"
repositorymodels "github.com/pikami/cosmium/internal/repository_models"
"github.com/stretchr/testify/assert"
)
@@ -41,7 +42,7 @@ func testCosmosQuery(t *testing.T, collectionClient *azcosmos.ContainerClient, q
}
func Test_Documents(t *testing.T) {
repositories.CreateCollection(testDatabaseName, repositories.Collection{
repositories.CreateCollection(testDatabaseName, repositorymodels.Collection{
ID: testCollectionName,
PartitionKey: struct {
Paths []string "json:\"paths\""