Create notify channel

bot/bot.go

@@ -10,6 +10,7 @@ import (
 	"github.com/grulex/go-wishlist/container"
 	authPkg "github.com/grulex/go-wishlist/pkg/auth"
 	imagePkg "github.com/grulex/go-wishlist/pkg/image"
+	"github.com/grulex/go-wishlist/pkg/notify"
 	productPkg "github.com/grulex/go-wishlist/pkg/product"
 	userPkg "github.com/grulex/go-wishlist/pkg/user"
 	wishlistPkg "github.com/grulex/go-wishlist/pkg/wishlist"
@@ -104,13 +105,13 @@ func (s TelegramBot) Start() error {
 		if update.MyChatMember != nil {
 			if update.MyChatMember.NewChatMember.Status == "member" {
 				lang := update.MyChatMember.From.LanguageCode
-				err := s.checkAndRegisterUser(ctx, update.MyChatMember.From)
+				err := s.checkAndRegisterUser(ctx, update.MyChatMember.From, update.MyChatMember.Chat)
 				if err != nil {
 					continue
 				}
 
 				go func() {
-					err := s.checkAvatar(ctx, update.MyChatMember.From.ID)
+					err := s.checkUpdates(ctx, update.MyChatMember.From.ID, update.MyChatMember.Chat.ID)
 					if err != nil {
 						log.Println(err)
 					}
@@ -127,6 +128,8 @@ func (s TelegramBot) Start() error {
 				if err != nil {
 					log.Println(err)
 				}
+			} else if update.MyChatMember.NewChatMember.Status == "kicked" {
+				// TODO: remove notify channel
 			}
 		}
 
@@ -162,7 +165,7 @@ func (s TelegramBot) Start() error {
 	return nil
 }
 
-func (s TelegramBot) checkAndRegisterUser(ctx context.Context, tgUser tgbotapi.User) error {
+func (s TelegramBot) checkAndRegisterUser(ctx context.Context, tgUser tgbotapi.User, tgChat tgbotapi.Chat) error {
 	userSocialID := authPkg.SocialID(null.NewString(strconv.Itoa(int(tgUser.ID)), true))
 
 	auth, err := s.container.Auth.Get(ctx, authPkg.MethodTelegram, userSocialID)
@@ -172,7 +175,7 @@ func (s TelegramBot) checkAndRegisterUser(ctx context.Context, tgUser tgbotapi.U
 		}
 	}
 	if auth == nil {
-		err = s.register(ctx, tgUser)
+		err = s.register(ctx, tgUser, tgChat)
 		if err != nil {
 			return err
 		}
@@ -181,7 +184,7 @@ func (s TelegramBot) checkAndRegisterUser(ctx context.Context, tgUser tgbotapi.U
 	return nil
 }
 
-func (s TelegramBot) checkAvatar(ctx context.Context, tgUserID int64) error {
+func (s TelegramBot) checkUpdates(ctx context.Context, tgUserID, tgChatID int64) error {
 	userSocialID := authPkg.SocialID(null.NewString(strconv.Itoa(int(tgUserID)), true))
 	auth, err := s.container.Auth.Get(ctx, authPkg.MethodTelegram, userSocialID)
 	if err != nil {
@@ -200,6 +203,16 @@ func (s TelegramBot) checkAvatar(ctx context.Context, tgUserID int64) error {
 	if err != nil {
 		return err
 	}
+	if user.NotifyType == nil {
+		tgType := notify.TypeTelegram
+		channelID := strconv.Itoa(int(tgChatID))
+		user.NotifyType = &tgType
+		user.NotifyChannelID = &channelID
+		err = s.container.User.Update(ctx, user)
+		if err != nil {
+			return err
+		}
+	}
 	wishlists, err := s.container.Wishlist.GetByUserID(ctx, user.ID)
 	if err != nil {
 		return err
@@ -216,7 +229,7 @@ func (s TelegramBot) checkAvatar(ctx context.Context, tgUserID int64) error {
 	return nil
 }
 
-func (s TelegramBot) register(ctx context.Context, tgUser tgbotapi.User) error {
+func (s TelegramBot) register(ctx context.Context, tgUser tgbotapi.User, tgChat tgbotapi.Chat) error {
 	createAuthTransaction, err := s.container.Auth.MakeCreateTransaction(ctx)
 	if err != nil {
 		return err
@@ -228,9 +241,13 @@ func (s TelegramBot) register(ctx context.Context, tgUser tgbotapi.User) error {
 		}
 	}(createAuthTransaction)
 
+	notifyTg := notify.TypeTelegram
+	notifyChannel := strconv.Itoa(int(tgChat.ID))
 	user := &userPkg.User{
-		FullName: tgUser.FirstName + " " + tgUser.LastName,
-		Language: userPkg.Language(tgUser.LanguageCode),
+		FullName:        tgUser.FirstName + " " + tgUser.LastName,
+		Language:        userPkg.Language(tgUser.LanguageCode),
+		NotifyType:      &notifyTg,
+		NotifyChannelID: &notifyChannel,
 	}
 
 	err = s.container.User.Create(ctx, user)

container/services.go

@@ -47,6 +47,7 @@ type subscribeService interface {
 type userService interface {
 	Create(ctx context.Context, user *userPkg.User) error
 	Get(ctx context.Context, userID userPkg.ID) (*userPkg.User, error)
+	Update(ctx context.Context, user *userPkg.User) error
 }
 
 type wishlistService interface {

pkg/notify/notify.go

@@ -0,0 +1,7 @@
+package notify
+
+type Type string
+
+const (
+	TypeTelegram Type = "telegram"
+)

pkg/user/service/service.go

@@ -28,6 +28,11 @@ func (s *Service) Create(ctx context.Context, user *userPkg.User) error {
 	return s.storage.Upsert(ctx, user)
 }
 
+func (s *Service) Update(ctx context.Context, user *userPkg.User) error {
+	user.UpdatedAt = time.Now().UTC()
+	return s.storage.Upsert(ctx, user)
+}
+
 func (s *Service) Get(ctx context.Context, id userPkg.ID) (*userPkg.User, error) {
 	return s.storage.Get(ctx, id)
 }

pkg/user/storage/postgres/postgres.go

@@ -4,16 +4,19 @@ import (
 	"context"
 	"database/sql"
 	"errors"
+	"github.com/grulex/go-wishlist/pkg/notify"
 	userPkg "github.com/grulex/go-wishlist/pkg/user"
 	"github.com/jmoiron/sqlx"
 	"time"
 )
 
 type userPersistent struct {
-	ID        string    `db:"id"`
-	FullName  string    `db:"full_name"`
-	CreatedAt time.Time `db:"created_at"`
-	Language  string    `db:"lang"`
+	ID              string    `db:"id"`
+	FullName        string    `db:"full_name"`
+	Language        string    `db:"lang"`
+	NotifyType      *string   `db:"notify_type"`
+	NotifyChannelID *string   `db:"notify_channel_id"`
+	CreatedAt       time.Time `db:"created_at"`
 }
 
 type Storage struct {
@@ -24,44 +27,67 @@ func NewUserStorage(db *sqlx.DB) *Storage {
 	return &Storage{db: db}
 }
 
-func (s *Storage) Upsert(_ context.Context, u *userPkg.User) error {
+func (s *Storage) Upsert(ctx context.Context, u *userPkg.User) error {
 	query := `INSERT INTO users (
 		id,
 		fullname,
 		created_at,
-		lang
+		lang,
+		notify_type,
+		notify_channel_id
 	) VALUES (
 		:id,
 		:full_name,
 		:created_at,
-		:lang
+		:lang,
+		:notify_type,
+		:notify_channel_id
 	) ON CONFLICT (id) DO UPDATE SET
 		fullname = :full_name,
-		lang = :lang`
+		lang = :lang,
+		notify_type = :notify_type,
+		notify_channel_id = :notify_channel_id`
+
+	var notifyType *string
+	if u.NotifyType != nil {
+		typeString := string(*u.NotifyType)
+		notifyType = &typeString
+	}
+
 	userPersistent := userPersistent{
-		ID:        string(u.ID),
-		FullName:  u.FullName,
-		CreatedAt: u.CreatedAt,
-		Language:  string(u.Language),
+		ID:              string(u.ID),
+		FullName:        u.FullName,
+		CreatedAt:       u.CreatedAt,
+		Language:        string(u.Language),
+		NotifyType:      notifyType,
+		NotifyChannelID: u.NotifyChannelID,
 	}
-	_, err := s.db.NamedExec(query, userPersistent)
+	_, err := s.db.NamedExecContext(ctx, query, userPersistent)
 	return err
 }
 
-func (s *Storage) Get(_ context.Context, id userPkg.ID) (*userPkg.User, error) {
+func (s *Storage) Get(ctx context.Context, id userPkg.ID) (*userPkg.User, error) {
 	query := `SELECT * FROM users WHERE id = $1`
 	userPersistent := userPersistent{}
-	err := s.db.Get(&userPersistent, query, string(id))
+	err := s.db.GetContext(ctx, &userPersistent, query, string(id))
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			return nil, userPkg.ErrNotFound
 		}
 		return nil, err
 	}
+
+	var notifyType *notify.Type
+	if userPersistent.NotifyType != nil {
+		typedType := notify.Type(*userPersistent.NotifyType)
+		notifyType = &typedType
+	}
 	return &userPkg.User{
-		ID:        userPkg.ID(userPersistent.ID),
-		FullName:  userPersistent.FullName,
-		CreatedAt: userPersistent.CreatedAt,
-		Language:  userPkg.Language(userPersistent.Language),
+		ID:              userPkg.ID(userPersistent.ID),
+		FullName:        userPersistent.FullName,
+		CreatedAt:       userPersistent.CreatedAt,
+		Language:        userPkg.Language(userPersistent.Language),
+		NotifyType:      notifyType,
+		NotifyChannelID: userPersistent.NotifyChannelID,
 	}, nil
 }

pkg/user/user.go

@@ -2,6 +2,7 @@ package user
 
 import (
 	"errors"
+	"github.com/grulex/go-wishlist/pkg/notify"
 	"time"
 )
 
@@ -11,8 +12,11 @@ type ID string
 type Language string
 
 type User struct {
-	ID        ID
-	FullName  string
-	CreatedAt time.Time
-	Language  Language
+	ID              ID
+	FullName        string
+	Language        Language
+	NotifyType      *notify.Type
+	NotifyChannelID *string
+	CreatedAt       time.Time
+	UpdatedAt       time.Time
 }