Merge pull request #122 from julwrites/staging

Fallback logic

Author: julwrites

pkg/app/api_client.go

@@ -56,14 +56,13 @@ func getAPIConfig(projectID string) (string, string) {
 
 	// If env vars are missing, try to fetch from Secret Manager
 	if url == "" || key == "" {
-		// Try to fetch project ID first from env
+		// Try to fetch project ID if not provided.
 		if projectID == "" {
-			projectID := os.Getenv("GCLOUD_PROJECT_ID")
+			projectID = os.Getenv("GCLOUD_PROJECT_ID")
 
-			// Then from secrets
 			if projectID == "" {
 				var err error
-				projectID, err = getSecretFunc(projectID, "GCLOUD_PROJECT_ID")
+				projectID, err = getSecretFunc("", "GCLOUD_PROJECT_ID")
 				if err != nil {
 					log.Printf("Failed to fetch GCLOUD_PROJECT_ID from Secret Manager: %v", err)
 				}

pkg/app/passage.go

@@ -15,8 +15,9 @@ import (
 	"github.com/julwrites/ScriptureBot/pkg/utils"
 )
 
+// GetPassageHTMLFunc is a variable to allow mocking in tests.
 // Deprecated: Using new API service
-func GetPassageHtml(ref, ver string) *html.Node {
+var GetPassageHTMLFunc = func(ref, ver string) *html.Node {
 	ref = url.QueryEscape(ref)
 	ver = url.QueryEscape(ver)
 	query := fmt.Sprintf("https://classic.biblegateway.com/passage/?search=%s&version=%s&interface=print", ref, ver)
@@ -205,13 +206,14 @@ func GetBiblePassage(env def.SessionData) def.SessionData {
 		var resp VerseResponse
 		err := SubmitQuery(req, &resp, env.Secrets.PROJECT_ID)
 		if err != nil {
-			log.Printf("Error retrieving passage: %v", err)
-			// Fallback or error message?
-			// For now, let's just log it and potentially return a friendly error message to the user if critical
-			// But sticking to existing behavior, maybe just return env unmodified or empty message?
-			// The original code returned env if doc == nil.
-			// Let's inform the user.
-			env.Res.Message = "Sorry, I couldn't retrieve that passage. Please check the reference or try again later."
+			log.Printf("Error retrieving passage from API: %v. Falling back to deprecated method.", err)
+			// Fallback to deprecated passage retrieval logic
+			doc := GetPassageHTMLFunc(env.Msg.Message, config.Version)
+			if doc == nil {
+				env.Res.Message = "Sorry, I couldn't retrieve that passage. Please check the reference or try again later."
+				return env
+			}
+			env.Res.Message = GetPassage(GetReference(doc), doc, config.Version)
 			return env
 		}
 
@@ -240,7 +242,7 @@ func CheckBibleReference(ref string) bool {
 	// The prompt says "Please do not remove the original code, but mark it as 'to be deprecated'".
 	// So I will leave the logic as is for the deprecated parts.
 
-	doc := GetPassageHtml(ref, "NIV")
+	doc := GetPassageHTMLFunc(ref, "NIV")
 	ref = GetReference(doc)
 	return len(ref) > 0
 }

pkg/app/passage_test.go

@@ -4,8 +4,11 @@ import (
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
+	"strings"
 	"testing"
 
+	"golang.org/x/net/html"
+
 	"github.com/julwrites/BotPlatform/pkg/def"
 	"github.com/julwrites/ScriptureBot/pkg/utils"
 )
@@ -16,15 +19,15 @@ func setEnv(key, value string) func() {
 }
 
 func TestGetBiblePassageHtml(t *testing.T) {
-	doc := GetPassageHtml("gen 8", "NIV")
+	doc := GetPassageHTMLFunc("gen 8", "NIV")
 
 	if doc == nil {
 		t.Errorf("Could not retrieve bible passage")
 	}
 }
 
 func TestGetReference(t *testing.T) {
-	doc := GetPassageHtml("gen 1", "NIV")
+	doc := GetPassageHTMLFunc("gen 1", "NIV")
 
 	if doc == nil {
 		t.Fatalf("Could not retrieve Bible passage for testing")
@@ -38,7 +41,7 @@ func TestGetReference(t *testing.T) {
 }
 
 func TestGetPassage(t *testing.T) {
-	doc := GetPassageHtml("john 8", "NIV")
+	doc := GetPassageHTMLFunc("john 8", "NIV")
 
 	passage := GetPassage("John 8", doc, "NIV")
 
@@ -56,20 +59,22 @@ func TestGetBiblePassage(t *testing.T) {
 			return
 		}
 
-		if len(req.Query.Verses) > 0 && req.Query.Verses[0] == "error" {
-			w.WriteHeader(http.StatusInternalServerError)
-			return
+		verse := ""
+		if len(req.Query.Verses) > 0 {
+			verse = req.Query.Verses[0]
 		}
 
-		if len(req.Query.Verses) > 0 && req.Query.Verses[0] == "empty" {
+		switch verse {
+		case "gen 1":
+			resp := VerseResponse{
+				Verse: "<p>In the beginning God created the heavens and the earth.</p>",
+			}
+			json.NewEncoder(w).Encode(resp)
+		case "empty":
 			json.NewEncoder(w).Encode(VerseResponse{})
-			return
-		}
-
-		resp := VerseResponse{
-			Verse: "<p>In the beginning God created the heavens and the earth.</p>",
+		default: // Any other case will trigger an error, forcing fallback
+			w.WriteHeader(http.StatusInternalServerError)
 		}
-		json.NewEncoder(w).Encode(resp)
 	}))
 	defer ts.Close()
 
@@ -89,13 +94,29 @@ func TestGetBiblePassage(t *testing.T) {
 		}
 	})
 
-	t.Run("Error", func(t *testing.T) {
+	t.Run("Fallback on API error", func(t *testing.T) {
 		var env def.SessionData
-		env.Msg.Message = "error"
+		env.Msg.Message = "John 1:1" // Use a valid reference to test the fallback
+		var conf utils.UserConfig
+		conf.Version = "NIV"
+		env.User.Config = utils.SerializeUserConfig(conf)
+
+		// Mock the GetPassageHTMLFunc to avoid network calls.
+		originalGetPassageHTML := GetPassageHTMLFunc
+		defer func() { GetPassageHTMLFunc = originalGetPassageHTML }()
+		GetPassageHTMLFunc = func(ref, ver string) *html.Node {
+			// Return a mock HTML node.
+			// The structure should be minimal but sufficient for GetPassage to parse.
+			mockHTML := `<html><body><div class="passage-text"><div class="bcv">John 1:1</div><p>Mocked passage text.</p></div></body></html>`
+			doc, _ := html.Parse(strings.NewReader(mockHTML))
+			return doc
+		}
+
 		env = GetBiblePassage(env)
 
-		if env.Res.Message != "Sorry, I couldn't retrieve that passage. Please check the reference or try again later." {
-			t.Errorf("Expected error message, got '%s'", env.Res.Message)
+		// The fallback should now use the mocked function.
+		if !strings.Contains(env.Res.Message, "Mocked passage text\\.") {
+			t.Errorf("Expected fallback message to contain 'Mocked passage text.', got: '%s'", env.Res.Message)
 		}
 	})
 

pkg/app/tms.go

@@ -146,7 +146,7 @@ func FormatQuery(query string, t TMSQueryType) string {
 		query = strings.ReplaceAll(query, " \t\n", "")
 		break
 	case Reference:
-		doc := GetPassageHtml(query, "NIV")
+		doc := GetPassageHTMLFunc(query, "NIV")
 		query = GetReference(doc)
 		break
 	}