ClickandJoin
/
ManagementSystem
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed chats to rooms

alpha
alex 2023-03-08 19:41:43 +01:00
parent 0570299518
commit 7135024a50
7 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -3,7 +3,7 @@ module clickandjoin.app/managementsystem
go 1.18
require (
git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.71
git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.77
github.com/gocql/gocql v0.0.0-20211015133455-b225f9b53fa1
github.com/gofiber/fiber/v2 v2.42.0
github.com/gofiber/websocket/v2 v2.1.4

2
go.sum
View File

@ -12,6 +12,8 @@ git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.70 h1:9/H8LSk+MK6Yuh
git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.70/go.mod h1:rnEM9rcZy2dg4SaDCGmSf34fp7ECzdyxxnRut2HBmrs=
git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.71 h1:FPBLRwAiWf/mvvO7rUZIfWXyyoHE3mK04iHFf8Pvbv0=
git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.71/go.mod h1:rnEM9rcZy2dg4SaDCGmSf34fp7ECzdyxxnRut2HBmrs=
git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.77 h1:GF5H+RSVubG9uP6/FF5llP0tKA+nm8C4gN3RDwhIW6A=
git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.77/go.mod h1:rnEM9rcZy2dg4SaDCGmSf34fp7ECzdyxxnRut2HBmrs=
github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY=

6
modules/structs/chat.go → modules/structs/room.go
View File

@ -2,7 +2,7 @@ package structs
import "git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper/dbstructs"
// swagger:model ChatsResponse
type ChatsResponse struct {
Chats []dbstructs.Chat
// swagger:model RoomsResponse
type RoomsResponse struct {
Rooms []dbstructs.Room
}

2
modules/structs/stats.go
View File

@ -4,7 +4,7 @@ package structs
type StatsResponse struct {
Users int
UserSessions int
Chats int
Rooms int
WebSocketSessions int
UserSignUpProcesses int
UserPrivacySettings int

20
routers/api/v1/chats/chats.go → routers/api/v1/rooms/rooms.go
View File

@ -1,4 +1,4 @@
package chats
package rooms
import (
"clickandjoin.app/managementsystem/modules/scylladb"
@ -8,10 +8,10 @@ import (
"github.com/gofiber/fiber/v2"
)
func GetAllChats(c *fiber.Ctx) error {
// swagger:operation GET /chats chats chatsGetAllChats
func GetAllRooms(c *fiber.Ctx) error {
// swagger:operation GET /rooms rooms roomsGetAllRooms
// ---
// summary: List of chats
// summary: List of rooms
// consumes:
// - application/json
// produces:
@ -19,17 +19,17 @@ func GetAllChats(c *fiber.Ctx) error {
// responses:
// '200':
// schema:
// "$ref": "#/definitions/ChatsResponse"
// "$ref": "#/definitions/RoomsResponse"
// '500':
// description: Internal server error
var chats []dbstructs.Chat
var rooms []dbstructs.Room
q := scylladb.Session.Query(gocnjhelper.DbMChats.SelectAll())
q := scylladb.Session.Query(gocnjhelper.DbMRooms.SelectAll())
if err := q.SelectRelease(&chats); err != nil {
gocnjhelper.LogErrorf("Failed to get chats, err: %s", err)
if err := q.SelectRelease(&rooms); err != nil {
gocnjhelper.LogErrorf("Failed to get rooms, err: %s", err)
}
return c.JSON(structs.ChatsResponse{Chats: chats})
return c.JSON(structs.RoomsResponse{Rooms: rooms})
}

4
routers/api/v1/stats/stats.go
View File

@ -33,8 +33,8 @@ func GetStats(c *fiber.Ctx) error {
stats.UserSessions = count
}
if count, err := getCount(gocnjhelper.DbMChats.Name()); err == nil {
stats.Chats = count
if count, err := getCount(gocnjhelper.DbMRooms.Name()); err == nil {
stats.Rooms = count
}
if count, err := getCount(gocnjhelper.DbMWebSocketSessions.Name()); err == nil {

6
routers/router/router.go
View File

@ -2,7 +2,7 @@ package router
import (
"clickandjoin.app/managementsystem/modules/config"
"clickandjoin.app/managementsystem/routers/api/v1/chats"
"clickandjoin.app/managementsystem/routers/api/v1/rooms"
"clickandjoin.app/managementsystem/routers/api/v1/stats"
"clickandjoin.app/managementsystem/routers/api/v1/user"
"clickandjoin.app/managementsystem/routers/api/v1/users"
@ -26,8 +26,8 @@ func SetupRoutes(app *fiber.App) {
wss := v1.Group("/wssessions")
wss.Get("/", ApiKeyValidation, wssessions.GetAllWsSessions)
c := v1.Group("/chats")
c.Get("/", ApiKeyValidation, chats.GetAllChats)
c := v1.Group("/rooms")
c.Get("/", ApiKeyValidation, rooms.GetAllRooms)
s := v1.Group("/stats")
s.Get("/", ApiKeyValidation, stats.GetStats)