Revert "feat: refactor to support larger user base - integrating FE interface"

This reverts commit c3d8102.

Author: opensaucerer

README.md

@@ -39,8 +39,8 @@ After completing the twitter sign in step, a JSON containing your details and JW
 First, clone the repo and install the dependencies:
 
 ```bash
-git clone https://github.com/opensaucerers/giveawaybotapi.git
-cd giveawaybotapi
+git clone https://github.com/opensaucerers/giveawaybot.git
+cd giveawaybot
 go mod tidy
 ```
 

controller/v1/giveaway/tweet.go

@@ -3,9 +3,7 @@ package giveaway
 import (
 	"context"
 	"net/http"
-	"strconv"
 
-	"github.com/opensaucerers/giveawaybot/config"
 	"github.com/opensaucerers/giveawaybot/helper"
 	"github.com/opensaucerers/giveawaybot/logic/v1/giveaway"
 	"github.com/opensaucerers/giveawaybot/repository/v1/user"
@@ -35,7 +33,7 @@ func Replies(w http.ResponseWriter, r *http.Request) {
 
 // Replies retrieves all replies to a giveaway
 func Report(w http.ResponseWriter, r *http.Request) {
-	// get giveaway id from context
+	// get user from context
 	id := r.Context().Value(typing.ParamsCtxKey{}).(map[string]string)["id"]
 	if id == "" {
 		helper.SendJSONResponse(w, false, http.StatusBadRequest, "Invalid giveaway ID", nil)
@@ -51,34 +49,3 @@ func Report(w http.ResponseWriter, r *http.Request) {
 	// send response
 	helper.SendJSONResponse(w, true, http.StatusOK, "Report generated", typing.M{"report": report})
 }
-
-// Past retrieves past giveaways
-func Past(w http.ResponseWriter, r *http.Request) {
-
-	var err error
-
-	var limit, offset int
-	limit = config.DefaultPageLimit
-	if r.URL.Query().Get("limit") != "" {
-		if limit, err = strconv.Atoi(r.URL.Query().Get("limit")); err != nil {
-			helper.SendJSONResponse(w, false, http.StatusBadRequest, err.Error(), nil)
-			return
-		}
-	}
-
-	if r.URL.Query().Get("offset") != "" {
-		if offset, err = strconv.Atoi(r.URL.Query().Get("offset")); err != nil {
-			helper.SendJSONResponse(w, false, http.StatusBadRequest, err.Error(), nil)
-			return
-		}
-	}
-
-	past, err := giveaway.Past(limit, offset)
-	if err != nil {
-		helper.SendJSONResponse(w, false, http.StatusBadRequest, err.Error(), nil)
-		return
-	}
-
-	// send response
-	helper.SendJSONResponse(w, true, http.StatusOK, "Giveaways retrieved", typing.M{"past": past})
-}

logic/v1/giveaway/tweet.go

@@ -10,7 +10,6 @@ import (
 	"github.com/opensaucerers/giveawaybot/repository/v1/user"
 	"github.com/opensaucerers/giveawaybot/service"
 	"github.com/opensaucerers/giveawaybot/typing"
-	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
@@ -150,21 +149,3 @@ func Report(id string) (*giveaway.Report, error) {
 
 	return &report, nil
 }
-
-// Past retrieves past giveaways
-func Past(limit, offset int) (giveaway.Giveaways, error) {
-	// build giveaway
-	ga := giveaway.Giveaways{}
-
-	// get past giveaways
-	err := ga.FindGiveawaysByMatch(bson.M{
-		"active":    false,
-		"completed": true,
-		"rewarded":  true,
-	}, int64(limit), int64(offset))
-	if err != nil {
-		return nil, err
-	}
-
-	return ga, nil
-}

repository/v1/giveaway/giveaway.go

@@ -217,7 +217,7 @@ func (g *Giveaways) FindGiveawaysByMatch(match bson.M, limit, offset int64) erro
 	if cursor, err := database.MongoDB.Collection(config.GiveawayCollection).Find(context.Background(), match, &options.FindOptions{
 		Limit: &limit,
 		Skip:  &offset,
-		Sort:  bson.M{"created_at": -1},
+		// Sort:  bson.M{"created_at": -1},
 	}); err != nil {
 		return err
 	} else {
@@ -233,7 +233,7 @@ func (r *Replies) FindRepliesByMatch(match bson.M, limit, offset int64) error {
 	if cursor, err := database.MongoDB.Collection(config.RepliesCollection).Find(context.Background(), match, &options.FindOptions{
 		Limit: &limit,
 		Skip:  &offset,
-		Sort:  bson.M{"created_at": -1},
+		// Sort:  bson.M{"created_at": -1},
 	}); err != nil {
 		return err
 	} else {

route/v1/giveaway/tweet.go

@@ -13,5 +13,4 @@ func RegisterTweetRoutes(r *mux.Router) {
 	// making them GET methods for now while there's no UI
 	router.Handle("/replies", middleware.AuthF(giveaway.Replies)).Methods("GET")
 	router.Handle("/report/{id}", middleware.ParamsF(giveaway.Report)).Methods("GET")
-	router.HandleFunc("/past", giveaway.Past).Methods("GET")
 }