feat: club and event search

backend/config/config.go

@@ -14,8 +14,6 @@ type Settings struct {
 	SuperUser       SuperUserSettings
 	Auth            AuthSettings
 	AWS             AWSSettings
-	Pinecone        PineconeSettings
-	OpenAI          OpenAISettings
 	Resend          ResendSettings
 	Calendar        CalendarSettings
 	GoogleSettings  OAuthSettings

backend/config/local.go

@@ -37,20 +37,6 @@ func readLocal(v *viper.Viper, path string, useDevDotEnv bool) (*Settings, error
 		return nil, fmt.Errorf("failed to load %s/.env.template: %w", path, err)
 	}
 
-	pineconeSettings, err := readPineconeSettings()
-	if err != nil {
-		return nil, fmt.Errorf("failed to read Pinecone settings: %w", err)
-	}
-
-	settings.Pinecone = *pineconeSettings
-
-	openAISettings, err := readOpenAISettings()
-	if err != nil {
-		return nil, fmt.Errorf("failed to read OpenAI settings: %w", err)
-	}
-
-	settings.OpenAI = *openAISettings
-
 	awsSettings, err := readAWSSettings()
 	if err != nil {
 		return nil, fmt.Errorf("failed to read AWS settings: %w", err)

backend/config/production.go

@@ -78,16 +78,6 @@ func readProd(v *viper.Viper) (*Settings, error) {
 		return nil, errors.New("failed to create secret from refresh token")
 	}
 
-	pineconeSettings, err := readPineconeSettings()
-	if err != nil {
-		return nil, fmt.Errorf("failed to read Pinecone settings: %w", err)
-	}
-
-	openAISettings, err := readOpenAISettings()
-	if err != nil {
-		return nil, fmt.Errorf("failed to read OpenAI settings: %w", err)
-	}
-
 	awsSettings, err := readAWSSettings()
 	if err != nil {
 		return nil, fmt.Errorf("failed to read AWS settings: %w", err)
@@ -129,8 +119,6 @@ func readProd(v *viper.Viper) (*Settings, error) {
 			AccessKey:  authAccessKey,
 			RefreshKey: authRefreshKey,
 		},
-		Pinecone:        *pineconeSettings,
-		OpenAI:          *openAISettings,
 		AWS:             *awsSettings,
 		Resend:          *resendSettings,
 		Calendar:        prodSettings.Calendar,

backend/constants/search.go

@@ -1,6 +1,8 @@
 package constants
 
 const (
-	SCORE_THRESHOLD float32 = 0.7
-	TOP_K_RESULTS   int     = 25
+	SEARCH_URL                       = "http://127.0.0.1:9200"
+	CLUBS_INDEX                      = "clubs"
+	EVENTS_INDEX                     = "events"
+	SEARCH_QUERY_DEFAULT_MAX_MEMBERS = 16384
 )

backend/entities/clubs/base/controller.go

@@ -3,7 +3,6 @@ package base
 import (
 	"net/http"
 
-	"github.com/GenerateNU/sac/backend/entities/models"
 	"github.com/GenerateNU/sac/backend/utilities"
 	"github.com/garrettladley/fiberpaginate"
 	"github.com/gofiber/fiber/v2"
@@ -31,17 +30,12 @@ func NewClubController(clubService ClubServiceInterface) *ClubController {
 // @Failure     500   {object}      error
 // @Router		/clubs/  [get]
 func (cl *ClubController) GetClubs(c *fiber.Ctx) error {
-	var queryParams models.ClubQueryParams
-	if err := c.QueryParser(&queryParams); err != nil {
-		return err
-	}
-
 	pagination, ok := fiberpaginate.FromContext(c)
 	if !ok {
 		return utilities.ErrExpectedPagination
 	}
 
-	clubs, err := cl.clubService.GetClubs(&queryParams, *pagination)
+	clubs, err := cl.clubService.GetClubs(*pagination)
 	if err != nil {
 		return err
 	}

backend/entities/clubs/base/service.go

@@ -11,7 +11,7 @@ import (
 )
 
 type ClubServiceInterface interface {
-	GetClubs(queryParams *models.ClubQueryParams, pageInfo fiberpaginate.PageInfo) ([]models.Club, error)
+	GetClubs(pageInfo fiberpaginate.PageInfo) ([]models.Club, error)
 	GetClub(id string) (*models.Club, error)
 	CreateClub(clubBody CreateClubRequestBody) (*models.Club, error)
 	UpdateClub(id string, clubBody UpdateClubRequestBody) (*models.Club, error)
@@ -26,8 +26,8 @@ func NewClubService(serviceParams types.ServiceParams) ClubServiceInterface {
 	return &ClubService{serviceParams}
 }
 
-func (c *ClubService) GetClubs(queryParams *models.ClubQueryParams, pageInfo fiberpaginate.PageInfo) ([]models.Club, error) {
-	return GetClubs(c.DB, c.Integrations.Search, queryParams, pageInfo)
+func (c *ClubService) GetClubs(pagination fiberpaginate.PageInfo) ([]models.Club, error) {
+	return GetClubs(c.DB, pagination)
 }
 
 func (c *ClubService) CreateClub(clubBody CreateClubRequestBody) (*models.Club, error) {
@@ -40,7 +40,7 @@ func (c *ClubService) CreateClub(clubBody CreateClubRequestBody) (*models.Club,
 		return nil, err
 	}
 
-	return CreateClub(c.DB, c.Integrations.Search, clubBody.UserID, *club)
+	return CreateClub(c.DB, clubBody.UserID, *club)
 }
 
 func (c *ClubService) GetClub(id string) (*models.Club, error) {
@@ -71,7 +71,7 @@ func (c *ClubService) UpdateClub(id string, clubBody UpdateClubRequestBody) (*mo
 		return nil, err
 	}
 
-	return UpdateClub(c.DB, c.Integrations.Search, *idAsUUID, *club)
+	return UpdateClub(c.DB, *idAsUUID, *club)
 }
 
 func (c *ClubService) DeleteClub(id string) error {
@@ -80,5 +80,5 @@ func (c *ClubService) DeleteClub(id string) error {
 		return err
 	}
 
-	return DeleteClub(c.DB, c.Integrations.Search, *idAsUUID)
+	return DeleteClub(c.DB, *idAsUUID)
 }

backend/entities/clubs/base/transactions.go

@@ -3,75 +3,21 @@ package base
 import (
 	"errors"
 
-	"github.com/GenerateNU/sac/backend/integrations/search"
+	"github.com/GenerateNU/sac/backend/constants"
 	"github.com/GenerateNU/sac/backend/utilities"
 	"github.com/garrettladley/fiberpaginate"
-	"github.com/sahilm/fuzzy"
 
 	"github.com/GenerateNU/sac/backend/entities/models"
 	"github.com/GenerateNU/sac/backend/entities/users"
-
+	search "github.com/GenerateNU/sac/backend/search/base"
 	"github.com/google/uuid"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 )
 
-func GetClubs(db *gorm.DB, pinecone search.SearchClientInterface, queryParams *models.ClubQueryParams, pageInfo fiberpaginate.PageInfo) ([]models.Club, error) {
+func GetClubs(db *gorm.DB, pageInfo fiberpaginate.PageInfo) ([]models.Club, error) {
 	query := db.Model(&models.Club{})
-
-	if queryParams.Tags != nil && len(queryParams.Tags) > 0 {
-		query = query.Preload("Tags")
-	}
-
-	query = query.Where(queryParams.IntoWhere())
-	query = query.Where("name != ?", "SAC")
-
-	if queryParams.Tags != nil && len(queryParams.Tags) > 0 {
-		query = query.Joins("JOIN club_tags ON club_tags.club_id = clubs.id").
-			Where("club_tags.tag_id IN ?", queryParams.Tags). // add search function here
-			Group("clubs.id")                                 // ensure unique club records
-	}
-
-	if queryParams.Search != "" {
-		clubSearch := models.NewClubSearch(queryParams.Search)
-		resultIDs, err := pinecone.Search(clubSearch)
-		if err != nil {
-			return nil, err
-		}
-
-		query = query.Where("id IN ?", resultIDs)
-	}
-
-	var clubs models.Clubs
-
-	if queryParams.Search != "" {
-		if err := query.Find(&clubs).Error; err != nil {
-			return nil, err
-		}
-
-		// len(matches) <= len(clubs), because it discardss results that don't fuzz at all.
-		matches := fuzzy.FindFrom(queryParams.Search, clubs)
-
-		// Copy the sorted, fuzzed matches to the top of the list, and record their indices
-		// in a list.
-		clubsSorted := models.Clubs{}
-		idxMap := map[int]bool{}
-		for _, match := range matches {
-			clubsSorted = append(clubsSorted, clubs[match.Index])
-			idxMap[match.Index] = true
-		}
-
-		// For the remaining clubs, append them to the bottom of the list, making sure not
-		// to include the fuzzed clubs again.
-		for i, club := range clubs {
-			_, exists := idxMap[i]
-			if !exists {
-				clubsSorted = append(clubsSorted, club)
-			}
-		}
-
-		return clubsSorted, nil
-	}
+	var clubs []models.Club
 
 	if err := query.Scopes(utilities.IntoScope(pageInfo, query)).Find(&clubs).Error; err != nil {
 		return nil, err
@@ -80,7 +26,7 @@ func GetClubs(db *gorm.DB, pinecone search.SearchClientInterface, queryParams *m
 	return clubs, nil
 }
 
-func CreateClub(db *gorm.DB, pinecone search.SearchClientInterface, userId uuid.UUID, club models.Club) (*models.Club, error) {
+func CreateClub(db *gorm.DB, userId uuid.UUID, club models.Club) (*models.Club, error) {
 	user, err := users.GetUser(db, userId)
 	if err != nil {
 		return nil, err
@@ -120,15 +66,20 @@ func CreateClub(db *gorm.DB, pinecone search.SearchClientInterface, userId uuid.
 		return nil, err
 	}
 
-	if err := pinecone.Upsert([]search.Searchable{&club}); err != nil {
+	if err := tx.Commit().Error; err != nil {
 		tx.Rollback()
 		return nil, err
 	}
 
-	return &club, tx.Commit().Error
+	err = search.Upsert[models.Club](db, constants.CLUBS_INDEX, club.ID.String(), &club)
+	if err != nil {
+		return nil, err
+	}
+
+	return &club, nil
 }
 
-func UpdateClub(db *gorm.DB, pinecone search.SearchClientInterface, id uuid.UUID, club models.Club) (*models.Club, error) {
+func UpdateClub(db *gorm.DB, id uuid.UUID, club models.Club) (*models.Club, error) {
 	tx := db.Begin()
 	defer func() {
 		if r := recover(); r != nil {
@@ -151,15 +102,20 @@ func UpdateClub(db *gorm.DB, pinecone search.SearchClientInterface, id uuid.UUID
 		return nil, err
 	}
 
-	if pinecone.Upsert([]search.Searchable{&existingClub}) != nil {
+	if err := tx.Commit().Error; err != nil {
 		tx.Rollback()
 		return nil, err
 	}
 
+	err = search.Upsert[models.Club](db, constants.CLUBS_INDEX, club.ID.String(), &club)
+	if err != nil {
+		return nil, err
+	}
+
 	return &existingClub, tx.Commit().Error
 }
 
-func DeleteClub(db *gorm.DB, pinecone search.SearchClientInterface, id uuid.UUID) error {
+func DeleteClub(db *gorm.DB, id uuid.UUID) error {
 	tx := db.Begin()
 	defer func() {
 		if r := recover(); r != nil {
@@ -177,11 +133,6 @@ func DeleteClub(db *gorm.DB, pinecone search.SearchClientInterface, id uuid.UUID
 		return err
 	}
 
-	if err := pinecone.Delete([]search.Searchable{&existingClub}); err != nil {
-		tx.Rollback()
-		return err
-	}
-
 	if result := tx.Delete(&models.Club{}, id); result.RowsAffected == 0 {
 		tx.Rollback()
 		if result.Error == nil {
@@ -190,5 +141,10 @@ func DeleteClub(db *gorm.DB, pinecone search.SearchClientInterface, id uuid.UUID
 		return result.Error
 	}
 
+	err = search.Delete(db, constants.CLUBS_INDEX, id.String())
+	if err != nil {
+		return err
+	}
+
 	return tx.Commit().Error
 }