astra/owpengram-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

business: fix contact projection and phone sharing

Browse source 
(cherry picked from commit c0a0e5b52240ed415d3b43ba77659821887bf50b)
This commit is contained in:
A 2026-06-07 23:36:06 +08:00
parent d84fa6e126
commit 860e581d06
18 changed files with 703 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

57
internal/app/contacts/service.go
View file

@ -11,8 +11,9 @@ import (
)
var (
ErrContactIDInvalid = errors.New("contact id invalid")
ErrContactNameEmpty = errors.New("contact name empty")
ErrContactIDInvalid = errors.New("contact id invalid")
ErrContactNameEmpty = errors.New("contact name empty")
ErrContactReqMissing = errors.New("contact request missing")
)
const maxSearchLimit = 50
@ -112,6 +113,54 @@ func (s *Service) AddContact(ctx context.Context, userID int64, input domain.Con
return contact, nil
}
// AcceptContact shares the current user's phone/profile with an existing one-way contact.
func (s *Service) AcceptContact(ctx context.Context, userID, contactUserID int64) (domain.Contact, error) {
if s == nil || s.contacts == nil || s.users == nil || userID == 0 || contactUserID == 0 || contactUserID == userID {
return domain.Contact{}, ErrContactIDInvalid
}
ownerContact, found, err := s.contacts.Get(ctx, userID, contactUserID)
if err != nil {
return domain.Contact{}, err
}
if !found {
return domain.Contact{}, ErrContactReqMissing
}
self, found, err := s.users.ByID(ctx, userID)
if err != nil {
return domain.Contact{}, err
}
if !found {
return domain.Contact{}, ErrContactIDInvalid
}
target, found, err := s.users.ByID(ctx, contactUserID)
if err != nil {
return domain.Contact{}, err
}
if !found {
return domain.Contact{}, ErrContactIDInvalid
}
if ownerContact.Mutual {
return ownerContact, nil
}
_, err = s.contacts.Upsert(ctx, contactUserID, domain.ContactInput{
ContactUserID: userID,
Phone: self.Phone,
FirstName: self.FirstName,
LastName: self.LastName,
})
if err != nil {
return domain.Contact{}, err
}
contact, found, err := s.contacts.Get(ctx, userID, target.ID)
if err != nil {
return domain.Contact{}, err
}
if !found {
return domain.Contact{}, ErrContactReqMissing
}
return contact, nil
}
func (s *Service) ImportContacts(ctx context.Context, userID int64, inputs []domain.ContactInput) (domain.ImportContactsResult, error) {
if s == nil || s.contacts == nil || s.users == nil || userID == 0 || len(inputs) == 0 {
return domain.ImportContactsResult{}, nil
@ -225,7 +274,7 @@ func (s *Service) GetPeerSettings(ctx context.Context, userID int64, peer domain
if s == nil || s.contacts == nil || userID == 0 || peer.Type != domain.PeerTypeUser || peer.ID == 0 || peer.ID == userID {
return domain.PeerSettings{}, nil
}
_, found, err := s.contacts.Get(ctx, userID, peer.ID)
contact, found, err := s.contacts.Get(ctx, userID, peer.ID)
if err != nil {
return domain.PeerSettings{}, err
}
@ -236,7 +285,7 @@ func (s *Service) GetPeerSettings(ctx context.Context, userID int64, peer domain
return domain.PeerSettings{
AddContact: !found,
BlockContact: !blocked,
ShareContact: found,
ShareContact: found && !contact.Mutual,
}, nil
}

88
internal/app/contacts/service_test.go
View file

@ -2,6 +2,7 @@ package contacts
import (
"context"
"errors"
"testing"
"telesrv/internal/domain"
@ -42,3 +43,90 @@ func TestImportContactsBatchesPhonesAndDedupesUpserts(t *testing.T) {
t.Fatalf("contact first name = %q, want final input", res.Contacts[0].FirstName)
}
}
func TestAcceptContactSharesPhoneAndClearsShareContact(t *testing.T) {
ctx := context.Background()
users := memory.NewUserStore()
contactsStore := memory.NewContactStore()
alice, err := users.Create(ctx, domain.User{Phone: "15550000001", FirstName: "Alice", LastName: "A"})
if err != nil {
t.Fatalf("create alice: %v", err)
}
bob, err := users.Create(ctx, domain.User{Phone: "15550000002", FirstName: "Bob", LastName: "B"})
if err != nil {
t.Fatalf("create bob: %v", err)
}
svc := NewService(contactsStore, users)
if _, err := svc.AddContact(ctx, alice.ID, domain.ContactInput{
ContactUserID: bob.ID,
Phone: bob.Phone,
FirstName: "Bobby",
LastName: "Remark",
}); err != nil {
t.Fatalf("alice add bob: %v", err)
}
settings, err := svc.GetPeerSettings(ctx, alice.ID, domain.Peer{Type: domain.PeerTypeUser, ID: bob.ID})
if err != nil {
t.Fatalf("alice peer settings before accept: %v", err)
}
if !settings.ShareContact {
t.Fatalf("alice settings before accept = %+v, want share contact", settings)
}
contact, err := svc.AcceptContact(ctx, alice.ID, bob.ID)
if err != nil {
t.Fatalf("AcceptContact: %v", err)
}
if !contact.Mutual || !contact.User.Mutual {
t.Fatalf("accepted contact = %+v, want mutual", contact)
}
aliceSettings, err := svc.GetPeerSettings(ctx, alice.ID, domain.Peer{Type: domain.PeerTypeUser, ID: bob.ID})
if err != nil {
t.Fatalf("alice peer settings after accept: %v", err)
}
if aliceSettings.ShareContact || aliceSettings.AddContact {
t.Fatalf("alice settings after accept = %+v, want no share/add", aliceSettings)
}
bobSettings, err := svc.GetPeerSettings(ctx, bob.ID, domain.Peer{Type: domain.PeerTypeUser, ID: alice.ID})
if err != nil {
t.Fatalf("bob peer settings after accept: %v", err)
}
if bobSettings.ShareContact || bobSettings.AddContact {
t.Fatalf("bob settings after accept = %+v, want no share/add", bobSettings)
}
reverse, found, err := contactsStore.Get(ctx, bob.ID, alice.ID)
if err != nil || !found {
t.Fatalf("bob contact alice found=%v err=%v", found, err)
}
if reverse.Phone != alice.Phone || reverse.FirstName != alice.FirstName || reverse.LastName != alice.LastName || !reverse.Mutual {
t.Fatalf("bob contact alice = %+v, want alice phone/name and mutual", reverse)
}
repeated, err := svc.AcceptContact(ctx, alice.ID, bob.ID)
if err != nil {
t.Fatalf("AcceptContact repeat: %v", err)
}
if !repeated.Mutual {
t.Fatalf("repeated accept = %+v, want mutual", repeated)
}
}
func TestAcceptContactRequiresExistingContactRequest(t *testing.T) {
ctx := context.Background()
users := memory.NewUserStore()
contactsStore := memory.NewContactStore()
alice, err := users.Create(ctx, domain.User{Phone: "15550000001", FirstName: "Alice"})
if err != nil {
t.Fatalf("create alice: %v", err)
}
bob, err := users.Create(ctx, domain.User{Phone: "15550000002", FirstName: "Bob"})
if err != nil {
t.Fatalf("create bob: %v", err)
}
svc := NewService(contactsStore, users)
if _, err := svc.AcceptContact(ctx, alice.ID, bob.ID); !errors.Is(err, ErrContactReqMissing) {
t.Fatalf("AcceptContact without contact err = %v, want ErrContactReqMissing", err)
}
}