Merge pull request #155 from julwrites/fix-test-failures

Fix test failures and database panic

Author: julwrites

go.sum

@@ -35,8 +35,6 @@ github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81
 github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/julwrites/BotPlatform v0.0.0-20220206144002-60e1b8060734 h1:U/z8aO/8zMpOzdR7kK9hnHfXber1fHa7FWlXGeuG3Yc=
-github.com/julwrites/BotPlatform v0.0.0-20220206144002-60e1b8060734/go.mod h1:RAVF1PibRuRYv1Z7VxNapzrikBrjtF48aFPCoCVnLpM=
 github.com/julwrites/BotPlatform v0.0.0-20251128175347-656700b2e4d4 h1:NeEPkJt4VXvyb/zxggO9zFs9tAJ07iiht1lAkUL/ZNs=
 github.com/julwrites/BotPlatform v0.0.0-20251128175347-656700b2e4d4/go.mod h1:PZT+yPLr4MrricOGOhXwiJCurNcGj36fD1jZOwMiuIk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=

pkg/app/passage.go

@@ -55,11 +55,8 @@ func ParseNodesForPassage(node *html.Node) string {
 		switch tag := child.Data; tag {
 		case "span":
 			childText := ParseNodesForPassage(child)
-			if len(childText) > 0 {
-				parts = append(parts, childText)
-				parts = append(parts, "\n")
-			} else {
-				parts = append(parts, child.Data)
+			parts = append(parts, childText)
+			if len(strings.TrimSpace(childText)) > 0 {
 				parts = append(parts, "\n")
 			}
 		case "sup":

pkg/app/passage_test.go

@@ -102,7 +102,7 @@ func TestParsePassageFromHtml(t *testing.T) {
 
 	t.Run("HTML with spans", func(t *testing.T) {
 		html := `<p><span>Line 1.</span><br><span>    </span><span>Line 2.</span></p>`
-		expected := "Line 1.\n\n    Line 2.\n"
+		expected := "Line 1.\n\n    Line 2."
 		if got := ParsePassageFromHtml("", html, ""); got != expected {
 			t.Errorf("ParsePassageFromHtml() = %v, want %v", got, expected)
 		}

pkg/utils/database.go

@@ -54,6 +54,11 @@ func GetUser(user def.UserData, project string) def.UserData {
 	ctx := context.Background()
 	client := OpenClient(&ctx, project)
 
+	if client == nil {
+		return user
+	}
+	defer client.Close()
+
 	key := datastore.NameKey("User", user.Id, nil)
 	var entity def.UserData
 	err := client.Get(ctx, key, &entity)
@@ -74,6 +79,11 @@ func GetAllUsers(project string) []def.UserData {
 	ctx := context.Background()
 	client := OpenClient(&ctx, project)
 
+	if client == nil {
+		return []def.UserData{}
+	}
+	defer client.Close()
+
 	var users []def.UserData
 
 	_, err := client.GetAll(ctx, datastore.NewQuery("User"), &users)
@@ -93,6 +103,11 @@ func PushUser(user def.UserData, project string) bool {
 	ctx := context.Background()
 	client := OpenClient(&ctx, project)
 
+	if client == nil {
+		return false
+	}
+	defer client.Close()
+
 	key := datastore.NameKey("User", user.Id, nil)
 
 	_, err := client.Put(ctx, key, &user)