totole/services
1
0
Fork 0
mirror of https://github.com/kevin-DL/services.git synced 2026-01-16 21:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Chats Service (#48)

Browse Source
This commit is contained in:
ben-toogood
2021-01-27 11:43:09 +00:00
committed by GitHub
parent 6ab2b2d9fa
commit 54c5994faf
30 changed files with 1855 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
streams/handler/create_message.go
View File

@@ -26,7 +26,7 @@ func (s *Streams) CreateMessage(ctx context.Context, req *pb.CreateMessageReques
return s.DB.Transaction(func(tx *gorm.DB) error {
// lookup the conversation
var conv Conversation
if err := s.DB.Where(&Conversation{ID: req.ConversationId}).First(&conv).Error; err == gorm.ErrRecordNotFound {
if err := tx.Where(&Conversation{ID: req.ConversationId}).First(&conv).Error; err == gorm.ErrRecordNotFound {
return ErrNotFound
} else if err != nil {
logger.Errorf("Error reading conversation: %v", err)
@@ -41,7 +41,7 @@ func (s *Streams) CreateMessage(ctx context.Context, req *pb.CreateMessageReques
AuthorID: req.AuthorId,
ConversationID: req.ConversationId,
}
if err := s.DB.Create(msg).Error; err != nil {
if err := tx.Create(msg).Error; err != nil {
logger.Errorf("Error creating message: %v", err)
return errors.InternalServerError("DATABASE_ERROR", "Error connecting to database")
}

20
streams/main.go
View File

@@ -1,13 +1,20 @@
package main
import (
"time"
"github.com/micro/services/streams/handler"
pb "github.com/micro/services/streams/proto"
"github.com/micro/micro/v3/service"
"github.com/micro/micro/v3/service/config"
"github.com/micro/micro/v3/service/logger"
"gorm.io/driver/postgres"
"gorm.io/gorm"
)
var dbAddress = "postgresql://postgres@localhost:5432/streams?sslmode=disable"
func main() {
// Create service
srv := service.New(
@@ -15,8 +22,19 @@ func main() {
service.Version("latest"),
)
// Connect to the database
cfg, err := config.Get("streams.database")
if err != nil {
logger.Fatalf("Error loading config: %v", err)
}
addr := cfg.String(dbAddress)
db, err := gorm.Open(postgres.Open(addr), &gorm.Config{})
if err != nil {
logger.Fatalf("Error connecting to database: %v", err)
}
// Register handler
pb.RegisterStreamsHandler(srv.Server(), new(handler.Streams))
pb.RegisterStreamsHandler(srv.Server(), &handler.Streams{DB: db, Time: time.Now})
// Run service
if err := srv.Run(); err != nil {