Skip to content

Commit 617a00a

Browse files
piyushroshanpiyushroshan
committed
Cleanup community service
1 parent 034b3b7 commit 617a00a

File tree

21 files changed

+77
-110
lines changed

21 files changed

+77
-110
lines changed

‎services/community/api/auth/token.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,22 @@ func ExtractTokenID(r *http.Request, db *gorm.DB) (uint32, error) {
6262
tokenString := ExtractToken(r)
6363
tokenJSON, err := json.Marshal(Token{Token: tokenString})
6464
if err != nil {
65-
log.Printf(err.Error())
65+
log.Println(err)
6666
return 0, err
6767
}
6868

6969
resp, err := http.Post(tokenVerifyURL, "application/json",
7070
bytes.NewBuffer(tokenJSON))
7171
if err != nil {
72-
log.Printf(err.Error())
72+
log.Println(err)
7373
return 0, err
7474
}
7575

7676
tokenValid := resp.StatusCode == 200
7777
token, _, err := new(jwt.Parser).ParseUnverified(tokenString, jwt.MapClaims{})
7878
claims, ok := token.Claims.(jwt.MapClaims)
7979
if err != nil {
80-
log.Printf(err.Error())
80+
log.Println(err)
8181
return 0, err
8282
}
8383

@@ -121,7 +121,7 @@ func Pretty(data interface{}) {
121121
return
122122
}
123123

124-
fmt.Println(string(b))
124+
log.Println(string(b))
125125
}
126126

127127
//

‎services/community/api/config/Initialize_mongo.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (server *Server) InitializeMongo(DbDriver, DbUser string, DbPassword string
4444
log.Fatal(err)
4545
}
4646

47-
fmt.Println("Connected to MongoDB!")
47+
log.Println("Connected to MongoDB!")
4848

4949
}
5050

‎services/community/api/controllers/coupon_controller.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ package controllers
1616

1717
import (
1818
"encoding/json"
19-
"io/ioutil"
19+
"io"
20+
"log"
2021
"net/http"
21-
"fmt"
2222

2323
"crapi.proj/goservice/api/models"
2424
"crapi.proj/goservice/api/responses"
@@ -29,7 +29,7 @@ import (
2929
//@params ResponseWriter, Request
3030
//Server have database connection
3131
func (s *Server) AddNewCoupon(w http.ResponseWriter, r *http.Request) {
32-
body, err := ioutil.ReadAll(r.Body)
32+
body, err := io.ReadAll(r.Body)
3333
if err != nil {
3434
responses.ERROR(w, http.StatusBadRequest, err)
3535
return
@@ -56,26 +56,26 @@ func (s *Server) AddNewCoupon(w http.ResponseWriter, r *http.Request) {
5656
//@params ResponseWriter, Request
5757
//Server have database connection
5858
func (s *Server) ValidateCoupon(w http.ResponseWriter, r *http.Request) {
59-
59+
6060
//coupon := models.CouponBody{}
6161
var bsonMap bson.M
6262

63-
body, err := ioutil.ReadAll(r.Body)
63+
body, err := io.ReadAll(r.Body)
6464
if err != nil {
6565
responses.ERROR(w, http.StatusBadRequest, err)
66-
fmt.Println("No payload for ValidateCoupon", body, err)
66+
log.Println("No payload for ValidateCoupon", body, err)
6767
return
6868
}
6969
err = json.Unmarshal(body, &bsonMap)
7070
if err != nil {
7171
responses.ERROR(w, http.StatusUnprocessableEntity, err)
72-
fmt.Println("Failed to read json body", err)
72+
log.Println("Failed to read json body", err)
7373
return
7474
}
7575
couponData, err := models.ValidateCode(s.Client, s.DB, bsonMap)
7676

7777
if err != nil {
78-
fmt.Println("Error fetching Coupon", couponData, err)
78+
log.Println("Error fetching Coupon", couponData, err)
7979
responses.JSON(w, http.StatusInternalServerError, err)
8080
return
8181
}

‎services/community/api/controllers/post_controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package controllers
1616

1717
import (
1818
"encoding/json"
19-
"io/ioutil"
19+
"io"
2020
"net/http"
2121
"strconv"
2222

@@ -31,7 +31,7 @@ import (
3131
//Server have database connection
3232
func (s *Server) AddNewPost(w http.ResponseWriter, r *http.Request) {
3333

34-
body, err := ioutil.ReadAll(r.Body)
34+
body, err := io.ReadAll(r.Body)
3535
if err != nil {
3636
responses.ERROR(w, http.StatusBadRequest, err)
3737
return
@@ -111,7 +111,7 @@ func (s *Server) GetPost(w http.ResponseWriter, r *http.Request) {
111111
func (s *Server) Comment(w http.ResponseWriter, r *http.Request) {
112112

113113
vars := mux.Vars(r)
114-
body, err := ioutil.ReadAll(r.Body)
114+
body, err := io.ReadAll(r.Body)
115115
if err != nil {
116116
responses.ERROR(w, http.StatusBadRequest, err)
117117
return

‎services/community/api/models/comments.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func CommentOnPost(client *mongo.Client, postComment Comments) (Post, error) {
4747
//Add comment in post
4848
updatePost.Comments = append(updatePost.Comments, comments)
4949

50-
update := bson.D{{"$set", bson.D{{"comments", updatePost.Comments}}}}
50+
update := bson.D{{Key: "$set", Value: bson.D{{Key: "comments", Value: updatePost.Comments}}}}
5151

5252
collection := client.Database("crapi").Collection("post")
5353

‎services/community/api/models/coupon.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ package models
1717
import (
1818
"context"
1919
"errors"
20-
"fmt"
2120
"html"
21+
"log"
2222
"strings"
2323
"time"
24+
2425
"github.com/jinzhu/gorm"
25-
"go.mongodb.org/mongo-driver/mongo"
2626
"go.mongodb.org/mongo-driver/bson"
27+
"go.mongodb.org/mongo-driver/mongo"
2728
)
2829

2930
//Coupon
@@ -63,9 +64,9 @@ func SaveCoupon(client *mongo.Client, coupon Coupon) (Coupon, error) {
6364
// Insert a single document
6465
insertResult, err := collection.InsertOne(context.TODO(), coupon)
6566
if err != nil {
66-
fmt.Println(err)
67+
log.Println(err)
6768
}
68-
fmt.Println("Inserted a single document: ", insertResult.InsertedID)
69+
log.Println("Inserted a single document: ", insertResult.InsertedID)
6970

7071
return coupon, err
7172
}

‎services/community/api/models/post.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package models
1717
import (
1818
"context"
1919
"errors"
20-
"fmt"
2120
"html"
2221
"log"
2322
"reflect"
@@ -84,7 +83,7 @@ func SavePost(client *mongo.Client, post Post) (Post, error) {
8483
collection := client.Database("crapi").Collection("post")
8584
_, err := collection.InsertOne(context.TODO(), post)
8685
if err != nil {
87-
fmt.Println(err)
86+
log.Println(err)
8887
}
8988

9089
return post, err
@@ -96,7 +95,7 @@ func GetPostByID(client *mongo.Client, ID string) (Post, error) {
9695

9796
//filter := bson.D{{"name", "Ash"}}
9897
collection := client.Database("crapi").Collection("post")
99-
filter := bson.D{{"id", ID}}
98+
filter := bson.D{{Key: "id", Value: ID}}
10099
err := collection.FindOne(context.TODO(), filter).Decode(&post)
101100

102101
return post, err
@@ -108,15 +107,15 @@ func FindAllPost(client *mongo.Client, offset int, limit int) ([]interface{}, er
108107
post := []Post{}
109108

110109
options := options.Find()
111-
options.SetSort(bson.D{{"_id", -1}})
110+
options.SetSort(bson.D{{Key: "_id", Value: -1}})
112111
options.SetLimit(int64(limit))
113112
options.SetSkip(int64(offset * limit))
114113
collection := client.Database("crapi").Collection("post")
115114
cur, err := collection.Find(context.Background(), bson.D{}, options)
116115
if err != nil {
117116
log.Println(err)
118117
}
119-
fmt.Println(cur)
118+
log.Println(cur)
120119
objectType := reflect.TypeOf(post).Elem()
121120
var list = make([]interface{}, 0)
122121
defer cur.Close(context.Background())

‎services/community/api/models/user.go‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ package models
1616

1717
import (
1818
"errors"
19+
"log"
1920
"strings"
2021
"time"
2122

2223
"github.com/badoux/checkmail"
2324
"github.com/jinzhu/gorm"
2425
"golang.org/x/crypto/bcrypt"
25-
26+
2627
"encoding/base64"
2728
)
2829

@@ -109,18 +110,27 @@ func FindAuthorByEmail(email string, db *gorm.DB) (*uint64, error) {
109110
//fetch id and number from for token user
110111
row := db.Table("user_login").Where("email LIKE ?", email).Select("id,number").Row()
111112

112-
row.Scan(&id, &number)
113+
err = row.Scan(&id, &number)
114+
if err != nil {
115+
log.Println("Error in FindAuthorByEmail", err)
116+
}
113117

114118
autherID = id
115119
//fetch name and picture from for token user
116120
row1 := db.Table("user_details").Where("user_id = ?", id).Select("name, lo_get(picture)").Row()
117-
row1.Scan(&name, &picture)
121+
err = row1.Scan(&name, &picture)
122+
if err != nil {
123+
log.Println("Error in FindAuthorByEmail", err)
124+
}
118125
if len(picture) > 0 {
119126
picurl = "data:image/jpeg;base64," + base64.StdEncoding.EncodeToString(picture)
120127
}
121128
nickname = name
122129
row2 := db.Table("vehicle_details").Where("owner_id = ?", id).Select("uuid").Row()
123-
row2.Scan(&uuid)
130+
err = row2.Scan(&uuid)
131+
if err != nil {
132+
log.Println("Error in FindAuthorByEmail", err)
133+
}
124134
vehicleID = uuid
125135
return number, err
126136
}

‎services/community/api/router/routes.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package router
1616

1717
import (
18-
"fmt"
18+
"log"
1919
"net/http"
2020
"os"
2121
"time"
@@ -29,10 +29,10 @@ import (
2929

3030
type Server config.Server
3131

32-
var controller = controllers.Server{}
3332

3433
// initializeRoutes initialize routes of url with Authentication or without Authentication
3534
func (server *Server) InitializeRoutes() *mux.Router {
35+
var controller = controllers.Server{}
3636

3737
controller.DB = server.DB
3838

@@ -59,7 +59,7 @@ func (server *Server) InitializeRoutes() *mux.Router {
5959
}
6060

6161
func (server *Server) Run(addr string) {
62-
fmt.Println("Listening to port " + os.Getenv("SERVER_PORT"))
62+
log.Println("Listening to port " + os.Getenv("SERVER_PORT"))
6363
srv := &http.Server{
6464
Addr: addr,
6565
Handler: server.Router,
@@ -79,12 +79,12 @@ func (server *Server) Run(addr string) {
7979
}
8080
err := srv.ListenAndServeTLS(certificate, key)
8181
if err != nil {
82-
fmt.Println(err)
82+
log.Println(err)
8383
}
8484
} else {
8585
err := srv.ListenAndServe()
8686
if err != nil {
87-
fmt.Println(err)
87+
log.Println(err)
8888
}
8989
}
9090
}

‎services/community/api/seed/seeder.go‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package seed
1616

1717
import (
1818
"context"
19-
"fmt"
19+
"log"
2020
"os"
2121
"time"
2222

@@ -70,20 +70,27 @@ func LoadMongoData(mongoClient *mongo.Client, db *gorm.DB) {
7070
// get a MongoDB document using the FindOne() method
7171
err := collection.FindOne(context.TODO(), bson.D{}).Decode(&couponResult)
7272
if err != nil {
73-
for i, _ := range coupons {
73+
for i := range coupons {
7474
couponData, err := collection.InsertOne(context.TODO(), coupons[i])
75-
fmt.Println(couponData, err)
75+
log.Println(couponData, err)
7676
}
7777
}
7878
postCollection := mongoClient.Database(os.Getenv("MONGO_DB_NAME")).Collection("post")
7979
er := postCollection.FindOne(context.TODO(), bson.D{}).Decode(&postResult)
8080
if er != nil {
81-
for j, _ := range posts {
82-
models.FindAuthorByEmail(emails[j], db)
81+
for j := range posts {
82+
author, err := models.FindAuthorByEmail(emails[j], db)
83+
if err != nil {
84+
log.Println("Error finding author", err)
85+
continue
86+
}
87+
log.Println(author)
8388
posts[j].Prepare()
84-
models.SavePost(mongoClient, posts[j])
85-
//postData, err := collection.InsertOne(context.TODO(), posts[j])
86-
//fmt.Println(postData, err)
89+
postData, err := models.SavePost(mongoClient, posts[j]) // Assign the returned values to separate variables
90+
if err != nil {
91+
log.Println("Error saving post", err)
92+
}
93+
log.Println(postData) // Use the returned values as needed
8794
}
8895
}
8996
}

0 commit comments

Comments
 (0)