From 303fc3675fd63adaf356dedf06cfd88af879e620 Mon Sep 17 00:00:00 2001 From: Akshay Date: Sat, 22 Mar 2025 13:49:49 +0000 Subject: [PATCH] allow only verified emails to assoc with dids --- appview/db/email.go | 17 +++++++++++++---- appview/state/repo_util.go | 6 +----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/appview/db/email.go b/appview/db/email.go index d69956c8..b4ee28e8 100644 --- a/appview/db/email.go +++ b/appview/db/email.go @@ -84,23 +84,32 @@ func GetDidForEmail(e Execer, em string) (string, error) { return did, nil } -func GetEmailToDid(e Execer, ems []string) (map[string]string, error) { +func GetEmailToDid(e Execer, ems []string, isVerifiedFilter bool) (map[string]string, error) { if len(ems) == 0 { return make(map[string]string), nil } + verifiedFilter := 0 + if isVerifiedFilter { + verifiedFilter = 1 + } + // Create placeholders for the IN clause placeholders := make([]string, len(ems)) - args := make([]any, len(ems)) + args := make([]any, len(ems)+1) + + args[0] = verifiedFilter for i, em := range ems { placeholders[i] = "?" - args[i] = em + args[i+1] = em } query := ` select email, did from emails - where email in (` + strings.Join(placeholders, ",") + `) + where + verified = ? + and email in (` + strings.Join(placeholders, ",") + `) ` rows, err := e.Query(query, args...) diff --git a/appview/state/repo_util.go b/appview/state/repo_util.go index 181bce87..d4800873 100644 --- a/appview/state/repo_util.go +++ b/appview/state/repo_util.go @@ -81,18 +81,16 @@ func uniqueEmails(commits []*object.Commit) []string { } func EmailToDidOrHandle(s *State, emails []string) map[string]string { - emailToDid, err := db.GetEmailToDid(s.db, emails) + emailToDid, err := db.GetEmailToDid(s.db, emails, true) // only get verified emails for mapping if err != nil { log.Printf("error fetching dids for emails: %v", err) return nil } - log.Println(emailToDid) var dids []string for _, v := range emailToDid { dids = append(dids, v) } - log.Println(dids) resolvedIdents := s.resolver.ResolveIdents(context.Background(), dids) didHandleMap := make(map[string]string) @@ -112,7 +110,5 @@ func EmailToDidOrHandle(s *State, emails []string) map[string]string { } } - log.Println(emailToDidOrHandle) - return emailToDidOrHandle } -- 2.51.2