Merge pull request #126 from bestreads/add-email-to-open-lib-requests

Add email to open lib requests

Author: LucaSchmitz2003

internal/config/config.go

@@ -31,6 +31,7 @@ type Config struct {
 	TokenRefreshPath           string `mapstructure:"TOKEN_REFRESH_PATH"`
 	TokenSecureFlag            bool   `mapstructure:"TOKEN_SECURE_FLAG"`
 	PaginationSteps            int    `mapstructure:"PAGINATION_STEPS"`
+	OpenLibraryRequestEmail    string `mapstructure:"OPEN_LIBRARY_REQUEST_EMAIL"`
 }
 
 func Load() *Config {

internal/handlers/book_search.go

@@ -14,7 +14,6 @@ func BookSearch(c *fiber.Ctx) error {
 	ctx := c.UserContext()
 	log := middlewares.Logger(ctx)
 	cfg := middlewares.Config(ctx)
-	httpClient := middlewares.HttpClient(ctx)
 
 	// Get offset from optional query param
 	offset := c.Query("offset")
@@ -66,7 +65,7 @@ func BookSearch(c *fiber.Ctx) error {
 		log.Debug().Int("localResults", len(books)).Int("limit", cfg.PaginationSteps).Msg("Not enough local results, searching Open Library API")
 
 		// Re-query DB to get all books including newly added ones
-		if err := services.SearchOpenLibrary(httpClient, ctx, query, cfg.PaginationSteps, author); err != nil {
+		if err := services.SearchOpenLibrary(ctx, query, cfg.PaginationSteps, author); err != nil {
 			log.Error().Err(err).Msg("Error searching in Open Library")
 			return c.Status(fiber.StatusInternalServerError).
 				JSON(dtos.GenericRestErrorResponse{

internal/services/openlibrary.go

@@ -12,17 +12,15 @@ import (
 	"github.com/bestreads/Backend/internal/middlewares"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
-	"resty.dev/v3"
 )
 
 const openLibrarySearchURL = "https://openlibrary.org/search.json" // Open Library Search-Endpoint
 const openLibraryBaseURL = "https://openlibrary.org"               // Basis-URL für Work-Details und Beschreibungen
-const maxConcurrentRequests = 7                                    // Rate limiting: maximal 7 gleichzeitige Requests
 
 // SearchOpenLibrary führt eine OpenLibrary-Suche aus, lädt parallel zugehörige Work-Descriptions
 // und speichert die gefundenen Bücher inklusive Beschreibung und Cover-URL in der Datenbank.
-func SearchOpenLibrary(httpClient *resty.Client, ctx context.Context, query string, limit int, searchAuthors bool) error {
-	response, err := searchBooks(ctx, httpClient, query, limit, searchAuthors)
+func SearchOpenLibrary(ctx context.Context, query string, limit int, searchAuthors bool) error {
+	response, err := searchBooks(ctx, query, limit, searchAuthors)
 	if err != nil {
 		return err
 	}
@@ -38,7 +36,7 @@ func SearchOpenLibrary(httpClient *resty.Client, ctx context.Context, query stri
 			defer wg.Done()
 
 			// hier holen wir die daten, seperat vom sperren
-			single, err := metadataSingle(httpClient, ctx, book)
+			single, err := metadataSingle(ctx, book)
 			if err != nil {
 				log := middlewares.Logger(ctx)
 				log.Err(err).Msg(fmt.Sprintf("worker %d returned an error", i))
@@ -67,13 +65,16 @@ func SearchOpenLibrary(httpClient *resty.Client, ctx context.Context, query stri
 	return nil
 }
 
-func searchBooks(ctx context.Context, c *resty.Client, query string, limit int, author bool) (dtos.OpenLibraryResponse, error) {
+func searchBooks(ctx context.Context, query string, limit int, author bool) (dtos.OpenLibraryResponse, error) {
+	httpClient := middlewares.HttpClient(ctx)
+	cfg := middlewares.Config(ctx)
 
 	var response dtos.OpenLibraryResponse
 
-	_, err := c.R().
+	_, err := httpClient.R().
 		SetContext(ctx).
 		SetQueryParams(buildQuery(query, strconv.Itoa(limit), author)).
+		SetHeader("User-Agent", fmt.Sprintf("BestReads/1.0 (%s)", cfg.OpenLibraryRequestEmail)).
 		SetResult(&response).
 		Get(openLibrarySearchURL)
 	if err != nil {
@@ -112,7 +113,7 @@ func insertNewBooks(ctx context.Context, books []database.Book) error {
 	return nil
 }
 
-func metadataSingle(client *resty.Client, ctx context.Context, book dtos.OpenLibraryBook) (dtos.OlibFullData, error) {
+func metadataSingle(ctx context.Context, book dtos.OpenLibraryBook) (dtos.OlibFullData, error) {
 	isbn, err := dtos.UnwrapFirst(book.ISBN)
 	if err != nil {
 		return dtos.OlibFullData{}, err
@@ -123,7 +124,7 @@ func metadataSingle(client *resty.Client, ctx context.Context, book dtos.OpenLib
 		return dtos.OlibFullData{}, err
 	}
 
-	desc := fetchWorkDetails(client, ctx, book.Key)
+	desc := fetchWorkDetails(ctx, book.Key)
 
 	cacheId, err := database.CacheMedia(coverUrlfmt(book.CoverID))
 	if err != nil {
@@ -147,7 +148,10 @@ func coverUrlfmt(id int) string {
 }
 
 // fetchWorkDetails ruft die Work-JSON von Open Library ab und extrahiert die Description
-func fetchWorkDetails(httpClient *resty.Client, ctx context.Context, workKey string) string {
+func fetchWorkDetails(ctx context.Context, workKey string) string {
+	httpClient := middlewares.HttpClient(ctx)
+	cfg := middlewares.Config(ctx)
+
 	if workKey == "" {
 		return "Es gibt keine Beschreibung für dieses Buch."
 	}
@@ -158,6 +162,7 @@ func fetchWorkDetails(httpClient *resty.Client, ctx context.Context, workKey str
 
 	_, err := httpClient.R().
 		SetContext(ctx).
+		SetHeader("User-Agent", fmt.Sprintf("BestReads/1.0 (%s)", cfg.OpenLibraryRequestEmail)).
 		SetResult(&workResponse).
 		Get(url)