add get entry by name.

This commit is contained in:
Miroslav Šedivý
2023-10-01 00:27:32 +02:00
parent 52dc6eaea8
commit 06b596959a
6 changed files with 138 additions and 26 deletions
+2 -1
View File
@@ -48,11 +48,12 @@ func (manager *ApiManagerCtx) Mount(r chi.Router) {
r.Route("/rooms/{roomId}", func(r chi.Router) {
r.Get("/", manager.roomGetEntry)
r.Delete("/", manager.roomGenericAction(manager.rooms.Remove))
r.Get("/by-name", manager.roomGetEntryByName)
r.Get("/settings", manager.roomGetSettings)
r.Get("/stats", manager.roomGetStats)
r.Delete("/", manager.roomGenericAction(manager.rooms.Remove))
r.Post("/start", manager.roomGenericAction(manager.rooms.Start))
r.Post("/stop", manager.roomGenericAction(manager.rooms.Stop))
r.Post("/restart", manager.roomGenericAction(manager.rooms.Restart))
+14
View File
@@ -133,6 +133,20 @@ func (manager *ApiManagerCtx) roomGetEntry(w http.ResponseWriter, r *http.Reques
json.NewEncoder(w).Encode(response)
}
func (manager *ApiManagerCtx) roomGetEntryByName(w http.ResponseWriter, r *http.Request) {
// roomId is actually room name here
roomName := chi.URLParam(r, "roomId")
response, err := manager.rooms.GetEntryByName(roomName)
if err != nil {
http.Error(w, err.Error(), 500)
return
}
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(response)
}
func (manager *ApiManagerCtx) roomGetSettings(w http.ResponseWriter, r *http.Request) {
roomId := chi.URLParam(r, "roomId")
+9 -9
View File
@@ -82,15 +82,6 @@ func (manager *RoomManagerCtx) List(labels map[string]string) ([]types.RoomEntry
return result, nil
}
func (manager *RoomManagerCtx) FindByName(name string) (*types.RoomEntry, error) {
container, err := manager.containerByName(name)
if err != nil {
return nil, err
}
return manager.containerToEntry(*container)
}
func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, error) {
if settings.Name != "" && !dockerNames.RestrictedNamePattern.MatchString(settings.Name) {
return "", fmt.Errorf("invalid container name, must match %s", dockerNames.RestrictedNameChars)
@@ -504,6 +495,15 @@ func (manager *RoomManagerCtx) GetEntry(id string) (*types.RoomEntry, error) {
return manager.containerToEntry(*container)
}
func (manager *RoomManagerCtx) GetEntryByName(name string) (*types.RoomEntry, error) {
container, err := manager.containerByName(name)
if err != nil {
return nil, err
}
return manager.containerToEntry(*container)
}
func (manager *RoomManagerCtx) Remove(id string) error {
_, err := manager.inspectContainer(id)
if err != nil {
+1 -1
View File
@@ -283,10 +283,10 @@ type RoomMember struct {
type RoomManager interface {
Config() RoomsConfig
List(labels map[string]string) ([]RoomEntry, error)
FindByName(name string) (*RoomEntry, error)
Create(settings RoomSettings) (string, error)
GetEntry(id string) (*RoomEntry, error)
GetEntryByName(name string) (*RoomEntry, error)
GetSettings(id string) (*RoomSettings, error)
GetStats(id string) (*RoomStats, error)
Remove(id string) error