Merge pull request #255 from swamphacks/master

chore:sync dev

Author: h1divp

apps/api/internal/bat/engine.go

@@ -148,6 +148,14 @@ func (b *BatEngine) GroupCandidates(admissionsData []AdmissionCandidate) ([]Team
 		}
 	}
 
+	// Check for teams with only one member and move them to individualCandidates
+	for teamID, candidates := range teamMap {
+		if len(candidates) == 1 {
+			individualCandidates = append(individualCandidates, candidates[0])
+			delete(teamMap, teamID)
+		}
+	}
+
 	teamsEvalData := make([]TeamEvaluationData, 0)
 	for teamId, members := range teamMap {
 		var totalScore float64

apps/api/internal/email/templates/ApplicationAcceptedEmail.html

@@ -46,7 +46,8 @@ <h2 style="margin:0; font-size:22px; color:#1a1a1a;">Hi {{ .Name }},</h2>
               </div>
 
               <p style="margin:0 0 15px 0; font-size:16px;">
-                Please confirm your attendance by January 2nd. <strong>Failure to do so means you are giving up your
+                Please confirm your attendance by <u>January 2nd</u>. <strong>Failure to do so means you are giving up
+                  your
                   spot,</strong> and
                 we will admit someone from a waitlist.
               </p>

apps/api/internal/email/templates/ApplicationRejectedEmail.html

@@ -47,7 +47,8 @@ <h2 style="margin:0; font-size:22px; color:#1a1a1a;">Hi {{ .Name }},</h2>
                 <li><strong>Join the Waitlist</strong>: We may have openings available closer to the event. You can
                   join the waitlist in the <a href="https://app.swamphacks.com/portal">SwampHacks Portal</a> or by
                   signing up
-                  in person on the day of check-in if space allows.
+                  in person on the day of check-in if space allows. The waitlist operates on a first-come, first-served
+                  basis.
                 </li>
                 <li><strong>Mentor</strong>: Share your knowledge and guide hackers through their projects. <a
                     href="https://swamphacks.com/mentor" style="color:#1155cc; text-decoration:underline;">Sign up to be

apps/api/internal/services/email.go

@@ -57,7 +57,6 @@ func (s *EmailService) SendHtmlEmail(recipient string, subject string, name stri
 		s.logger.Err(err).Msg("Failed to parse email template for recipient")
 	}
 
-	s.logger.Info().Str("Name", name)
 	err = template.Execute(&body, struct{ Name string }{Name: name})
 	if err != nil {
 		s.logger.Err(err).Msg("Failed to inject template variables for recipient '%s'.")
@@ -68,6 +67,7 @@ func (s *EmailService) SendHtmlEmail(recipient string, subject string, name stri
 		s.logger.Err(err).Msg("Failed to send confirmation email to recipient")
 		return err
 	}
+	s.logger.Info().Str("Template", templateFilePath).Msg("Sent email")
 
 	return nil
 }