Cleanup community service

services/community/api/auth/token.go

@@ -62,22 +62,22 @@ func ExtractTokenID(r *http.Request, db *gorm.DB) (uint32, error) {
 	tokenString := ExtractToken(r)
 	tokenJSON, err := json.Marshal(Token{Token: tokenString})
 	if err != nil {
-		log.Printf(err.Error())
+		log.Println(err)
 		return 0, err
 	}
 
 	resp, err := http.Post(tokenVerifyURL, "application/json",
 		bytes.NewBuffer(tokenJSON))
 	if err != nil {
-		log.Printf(err.Error())
+		log.Println(err)
 		return 0, err
 	}
 
 	tokenValid := resp.StatusCode == 200
 	token, _, err := new(jwt.Parser).ParseUnverified(tokenString, jwt.MapClaims{})
 	claims, ok := token.Claims.(jwt.MapClaims)
 	if err != nil {
-		log.Printf(err.Error())
+		log.Println(err)
 		return 0, err
 	}
 
@@ -121,7 +121,7 @@ func Pretty(data interface{}) {
 		return
 	}
 
-	fmt.Println(string(b))
+	log.Println(string(b))
 }
 
 //

services/community/api/config/Initialize_mongo.go

@@ -44,7 +44,7 @@ func (server *Server) InitializeMongo(DbDriver, DbUser string, DbPassword string
 			log.Fatal(err)
 		}
 
-		fmt.Println("Connected to MongoDB!")
+		log.Println("Connected to MongoDB!")
 
 	}
 

services/community/api/controllers/coupon_controller.go

@@ -16,9 +16,9 @@ package controllers
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
+	"log"
 	"net/http"
-	"fmt"
 
 	"crapi.proj/goservice/api/models"
 	"crapi.proj/goservice/api/responses"
@@ -29,7 +29,7 @@ import (
 //@params ResponseWriter, Request
 //Server have database connection
 func (s *Server) AddNewCoupon(w http.ResponseWriter, r *http.Request) {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		responses.ERROR(w, http.StatusBadRequest, err)
 		return
@@ -56,26 +56,26 @@ func (s *Server) AddNewCoupon(w http.ResponseWriter, r *http.Request) {
 //@params ResponseWriter, Request
 //Server have database connection
 func (s *Server) ValidateCoupon(w http.ResponseWriter, r *http.Request) {
-	
+
 	//coupon := models.CouponBody{}
 	var bsonMap bson.M
 
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		responses.ERROR(w, http.StatusBadRequest, err)
-		fmt.Println("No payload for ValidateCoupon", body, err)
+		log.Println("No payload for ValidateCoupon", body, err)
 		return
 	}
 	err = json.Unmarshal(body, &bsonMap)
 	if err != nil {
 		responses.ERROR(w, http.StatusUnprocessableEntity, err)
-		fmt.Println("Failed to read json body", err)
+		log.Println("Failed to read json body", err)
 		return
 	}
 	couponData, err := models.ValidateCode(s.Client, s.DB, bsonMap)
 
 	if err != nil {
-		fmt.Println("Error fetching Coupon", couponData, err)
+		log.Println("Error fetching Coupon", couponData, err)
 		responses.JSON(w, http.StatusInternalServerError, err)
 		return
 	}

services/community/api/controllers/post_controller.go

@@ -16,7 +16,7 @@ package controllers
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strconv"
 
@@ -31,7 +31,7 @@ import (
 //Server have database connection
 func (s *Server) AddNewPost(w http.ResponseWriter, r *http.Request) {
 
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		responses.ERROR(w, http.StatusBadRequest, err)
 		return
@@ -111,7 +111,7 @@ func (s *Server) GetPost(w http.ResponseWriter, r *http.Request) {
 func (s *Server) Comment(w http.ResponseWriter, r *http.Request) {
 
 	vars := mux.Vars(r)
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		responses.ERROR(w, http.StatusBadRequest, err)
 		return

services/community/api/models/comments.go

@@ -47,7 +47,7 @@ func CommentOnPost(client *mongo.Client, postComment Comments) (Post, error) {
 		//Add comment in post
 		updatePost.Comments = append(updatePost.Comments, comments)
 
-		update := bson.D{{"$set", bson.D{{"comments", updatePost.Comments}}}}
+		update := bson.D{{Key: "$set", Value: bson.D{{Key: "comments", Value: updatePost.Comments}}}}
 
 		collection := client.Database("crapi").Collection("post")
 

services/community/api/models/coupon.go

@@ -17,13 +17,14 @@ package models
 import (
 	"context"
 	"errors"
-	"fmt"
 	"html"
+	"log"
 	"strings"
 	"time"
+
 	"github.com/jinzhu/gorm"
-	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
 )
 
 //Coupon
@@ -63,9 +64,9 @@ func SaveCoupon(client *mongo.Client, coupon Coupon) (Coupon, error) {
 	// Insert a single document
 	insertResult, err := collection.InsertOne(context.TODO(), coupon)
 	if err != nil {
-		fmt.Println(err)
+		log.Println(err)
 	}
-	fmt.Println("Inserted a single document: ", insertResult.InsertedID)
+	log.Println("Inserted a single document: ", insertResult.InsertedID)
 
 	return coupon, err
 }

services/community/api/models/post.go

@@ -17,7 +17,6 @@ package models
 import (
 	"context"
 	"errors"
-	"fmt"
 	"html"
 	"log"
 	"reflect"
@@ -84,7 +83,7 @@ func SavePost(client *mongo.Client, post Post) (Post, error) {
 	collection := client.Database("crapi").Collection("post")
 	_, err := collection.InsertOne(context.TODO(), post)
 	if err != nil {
-		fmt.Println(err)
+		log.Println(err)
 	}
 
 	return post, err
@@ -96,7 +95,7 @@ func GetPostByID(client *mongo.Client, ID string) (Post, error) {
 
 	//filter := bson.D{{"name", "Ash"}}
 	collection := client.Database("crapi").Collection("post")
-	filter := bson.D{{"id", ID}}
+	filter := bson.D{{Key: "id", Value: ID}}
 	err := collection.FindOne(context.TODO(), filter).Decode(&post)
 
 	return post, err
@@ -108,15 +107,15 @@ func FindAllPost(client *mongo.Client, offset int, limit int) ([]interface{}, er
 	post := []Post{}
 
 	options := options.Find()
-	options.SetSort(bson.D{{"_id", -1}})
+	options.SetSort(bson.D{{Key: "_id", Value: -1}})
 	options.SetLimit(int64(limit))
 	options.SetSkip(int64(offset * limit))
 	collection := client.Database("crapi").Collection("post")
 	cur, err := collection.Find(context.Background(), bson.D{}, options)
 	if err != nil {
 		log.Println(err)
 	}
-	fmt.Println(cur)
+	log.Println(cur)
 	objectType := reflect.TypeOf(post).Elem()
 	var list = make([]interface{}, 0)
 	defer cur.Close(context.Background())

services/community/api/models/user.go

@@ -16,13 +16,14 @@ package models
 
 import (
 	"errors"
+	"log"
 	"strings"
 	"time"
 
 	"github.com/badoux/checkmail"
 	"github.com/jinzhu/gorm"
 	"golang.org/x/crypto/bcrypt"
-	
+
 	"encoding/base64"
 )
 
@@ -109,18 +110,27 @@ func FindAuthorByEmail(email string, db *gorm.DB) (*uint64, error) {
 	//fetch id and number from for token user
 	row := db.Table("user_login").Where("email LIKE ?", email).Select("id,number").Row()
 
-	row.Scan(&id, &number)
+	err = row.Scan(&id, &number)
+	if err != nil {
+		log.Println("Error in FindAuthorByEmail", err)
+	}
 
 	autherID = id
 	//fetch name and picture from for token user
 	row1 := db.Table("user_details").Where("user_id = ?", id).Select("name, lo_get(picture)").Row()
-	row1.Scan(&name, &picture)
+	err = row1.Scan(&name, &picture)
+	if err != nil {
+		log.Println("Error in FindAuthorByEmail", err)
+	}
 	if len(picture) > 0 {
 		picurl = "data:image/jpeg;base64," + base64.StdEncoding.EncodeToString(picture)
 	}
 	nickname = name
 	row2 := db.Table("vehicle_details").Where("owner_id = ?", id).Select("uuid").Row()
-	row2.Scan(&uuid)
+	err = row2.Scan(&uuid)
+	if err != nil {
+		log.Println("Error in FindAuthorByEmail", err)
+	}
 	vehicleID = uuid
 	return number, err
 }

services/community/api/router/routes.go

@@ -15,7 +15,7 @@
 package router
 
 import (
-	"fmt"
+	"log"
 	"net/http"
 	"os"
 	"time"
@@ -29,10 +29,10 @@ import (
 
 type Server config.Server
 
-var controller = controllers.Server{}
 
 // initializeRoutes initialize routes of url with Authentication or without Authentication
 func (server *Server) InitializeRoutes() *mux.Router {
+	var controller = controllers.Server{}
 
 	controller.DB = server.DB
 
@@ -59,7 +59,7 @@ func (server *Server) InitializeRoutes() *mux.Router {
 }
 
 func (server *Server) Run(addr string) {
-	fmt.Println("Listening to port " + os.Getenv("SERVER_PORT"))
+	log.Println("Listening to port " + os.Getenv("SERVER_PORT"))
 	srv := &http.Server{
 		Addr:    addr,
 		Handler: server.Router,
@@ -79,12 +79,12 @@ func (server *Server) Run(addr string) {
 		}
 		err := srv.ListenAndServeTLS(certificate, key)
 		if err != nil {
-			fmt.Println(err)
+			log.Println(err)
 		}
 	} else {
 		err := srv.ListenAndServe()
 		if err != nil {
-			fmt.Println(err)
+			log.Println(err)
 		}
 	}
 }

services/community/api/seed/seeder.go

@@ -16,7 +16,7 @@ package seed
 
 import (
 	"context"
-	"fmt"
+	"log"
 	"os"
 	"time"
 
@@ -70,20 +70,27 @@ func LoadMongoData(mongoClient *mongo.Client, db *gorm.DB) {
 	// get a MongoDB document using the FindOne() method
 	err := collection.FindOne(context.TODO(), bson.D{}).Decode(&couponResult)
 	if err != nil {
-		for i, _ := range coupons {
+		for i := range coupons {
 			couponData, err := collection.InsertOne(context.TODO(), coupons[i])
-			fmt.Println(couponData, err)
+			log.Println(couponData, err)
 		}
 	}
 	postCollection := mongoClient.Database(os.Getenv("MONGO_DB_NAME")).Collection("post")
 	er := postCollection.FindOne(context.TODO(), bson.D{}).Decode(&postResult)
 	if er != nil {
-		for j, _ := range posts {
-			models.FindAuthorByEmail(emails[j], db)
+		for j := range posts {
+			author, err := models.FindAuthorByEmail(emails[j], db)
+			if err != nil {
+				log.Println("Error finding author", err)
+				continue
+			}
+			log.Println(author)
 			posts[j].Prepare()
-			models.SavePost(mongoClient, posts[j])
-			//postData, err := collection.InsertOne(context.TODO(), posts[j])
-			//fmt.Println(postData, err)
+			postData, err := models.SavePost(mongoClient, posts[j]) // Assign the returned values to separate variables
+			if err != nil {
+				log.Println("Error saving post", err)
+			}
+			log.Println(postData) // Use the returned values as needed
 		}
 	}
 }

services/community/api/server.go

@@ -25,8 +25,7 @@ import (
 	"github.com/joho/godotenv"
 )
 
-var server = config.Server{}
-var route = router.Server{}
+
 
 func init() {
 	// loads values from .env into the system
@@ -36,6 +35,8 @@ func init() {
 }
 
 func Run() {
+	var server = config.Server{}
+	var route = router.Server{}
 
 	route.Client = server.InitializeMongo("mongodb", os.Getenv("MONGO_DB_USER"), os.Getenv("MONGO_DB_PASSWORD"), os.Getenv("MONGO_DB_PORT"), os.Getenv("MONGO_DB_HOST"))