Skip to content

Commit

Permalink
added logging endpoints
Browse files Browse the repository at this point in the history
  • Loading branch information
@KenWilliamson
KenWilliamson committed Aug 23, 2023
1 parent 29fb7c9 commit 7d0f8fa
Show file tree
Hide file tree
Showing 12 changed files with 592 additions and 236 deletions.
8 changes: 4 additions & 4 deletions delegates/coverage.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,16 +162,16 @@ github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:118.2,118.13 1 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:122.52,125.16 3 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:125.16,127.17 2 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:127.17,132.4 4 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:134.2,135.13 2 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:134.2,135.15 2 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:139.53,142.16 3 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:142.16,144.17 2 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:144.17,149.4 4 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:151.2,152.13 2 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:151.2,152.15 2 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:156.61,159.16 3 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:159.16,161.17 2 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:161.17,166.4 4 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:168.2,169.13 2 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:168.2,169.16 2 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:173.56,176.16 3 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:176.16,178.17 2 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:178.17,183.4 4 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:185.2,186.13 2 1
github.com/Ulbora/go-micro-blog-ui/delegates/userDelegate.go:185.2,186.15 2 1
40 changes: 20 additions & 20 deletions delegates/userDelegate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,68 +120,68 @@ func (d *MCDelegate) GetBannedUserList() *[]User {

// EnableUser EnableUser
func (d *MCDelegate) EnableUser(u *User) *Response {
var rtn Response
var eurtn Response
aJSON, err := json.Marshal(u)
if err == nil {
erq, err := d.buildRequest(http.MethodPut, "/rs/user/enable", aJSON, adminKey)
if err == nil {
usuc, stat := d.proxy.Do(erq, &rtn)
rtn.Code = int64(stat)
usuc, stat := d.proxy.Do(erq, &eurtn)
eurtn.Code = int64(stat)
d.Log.Debug("suc: ", usuc)
d.Log.Debug("stat: ", stat)
}
}
d.Log.Debug("rtn: ", rtn)
return &rtn
d.Log.Debug("rtn: ", eurtn)
return &eurtn
}

// DisableUser DisableUser
func (d *MCDelegate) DisableUser(u *User) *Response {
var rtn Response
var durtn Response
aJSON, err := json.Marshal(u)
if err == nil {
drq, err := d.buildRequest(http.MethodPut, "/rs/user/disable", aJSON, adminKey)
if err == nil {
dsuc, stat := d.proxy.Do(drq, &rtn)
rtn.Code = int64(stat)
dsuc, stat := d.proxy.Do(drq, &durtn)
durtn.Code = int64(stat)
d.Log.Debug("suc: ", dsuc)
d.Log.Debug("stat: ", stat)
}
}
d.Log.Debug("rtn: ", rtn)
return &rtn
d.Log.Debug("rtn: ", durtn)
return &durtn
}

// DisableUserForCause DisableUserForCause
func (d *MCDelegate) DisableUserForCause(u *User) *Response {
var rtn Response
var ddurtn Response
aJSON, err := json.Marshal(u)
if err == nil {
drq, err := d.buildRequest(http.MethodPut, "/rs/user/disableForCause", aJSON, adminKey)
if err == nil {
dsuc, stat := d.proxy.Do(drq, &rtn)
rtn.Code = int64(stat)
dsuc, stat := d.proxy.Do(drq, &ddurtn)
ddurtn.Code = int64(stat)
d.Log.Debug("suc: ", dsuc)
d.Log.Debug("stat: ", stat)
}
}
d.Log.Debug("rtn: ", rtn)
return &rtn
d.Log.Debug("rtn: ", ddurtn)
return &ddurtn
}

// ReactivateUser ReactivateUser
func (d *MCDelegate) ReactivateUser(u *User) *Response {
var rtn Response
var rertn Response
aJSON, err := json.Marshal(u)
if err == nil {
erq, err := d.buildRequest(http.MethodPut, "/rs/user/reinstate", aJSON, adminKey)
if err == nil {
usuc, stat := d.proxy.Do(erq, &rtn)
rtn.Code = int64(stat)
usuc, stat := d.proxy.Do(erq, &rertn)
rertn.Code = int64(stat)
d.Log.Debug("suc: ", usuc)
d.Log.Debug("stat: ", stat)
}
}
d.Log.Debug("rtn: ", rtn)
return &rtn
d.Log.Debug("rtn: ", rertn)
return &rertn
}
90 changes: 45 additions & 45 deletions handlers/adminBlogHandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,20 @@ import (
// GetAdminBlogList GetAdminBlogList
func (h *MCHandler) GetAdminBlogList(w http.ResponseWriter, r *http.Request) {
fmt.Println("in GetAdminBlogList")
s, suc := h.getSession(r)
abs, suc := h.getSession(r)
h.Log.Debug("session suc in GetBlog", suc)
if suc {
loggedInAuth := s.Get("loggedIn")
var isAdmin = s.Get("isAdmin")
loggedInAuth := abs.Get("loggedIn")
var isAdmin = abs.Get("isAdmin")
h.Log.Debug("loggedIn in GetBlog: ", loggedInAuth)
if loggedInAuth == true && isAdmin == true {
blogList := h.Delegate.GetAdminBlogList(0, maxPosts)
h.Log.Debug("blogCnt: ", len(*blogList))
ablogList := h.Delegate.GetAdminBlogList(0, maxPosts)
h.Log.Debug("blogCnt: ", len(*ablogList))
var bp BlogPage
bp.Title = h.Title
bp.Desc = h.Desc
bp.KeyWords = h.KeyWords
uemail := s.Get("userEmail")
uemail := abs.Get("userEmail")
if uemail != nil {
bp.MyEmail = uemail.(string)
}
Expand All @@ -56,19 +56,19 @@ func (h *MCHandler) GetAdminBlogList(w http.ResponseWriter, r *http.Request) {
bp.IsAdmin = true
}
var blst []Blog
for i := range *blogList {
for i := range *ablogList {
var wg sync.WaitGroup
var bb Blog
bb.Blog = &(*blogList)[i]
txt, err := b64.StdEncoding.DecodeString(bb.Blog.Content)
var abb Blog
abb.Blog = &(*ablogList)[i]
txt, err := b64.StdEncoding.DecodeString(abb.Blog.Content)
if err == nil {
bb.Blog.Content = string(txt)
bb.Blog.Content = strings.Replace(bb.Blog.Content, stripOut, "", -1)
bb.Blog.Content = strings.Replace(bb.Blog.Content, stripOut2, "", -1)
bb.Blog.Content = strings.Replace(bb.Blog.Content, stripOut3, "", -1)
bb.Blog.Content = strings.Replace(bb.Blog.Content, stripOut4, "", -1)
abb.Blog.Content = string(txt)
abb.Blog.Content = strings.Replace(abb.Blog.Content, stripOut, "", -1)
abb.Blog.Content = strings.Replace(abb.Blog.Content, stripOut2, "", -1)
abb.Blog.Content = strings.Replace(abb.Blog.Content, stripOut3, "", -1)
abb.Blog.Content = strings.Replace(abb.Blog.Content, stripOut4, "", -1)

bb.TextHTML = template.HTML(bb.Blog.Content)
abb.TextHTML = template.HTML(abb.Blog.Content)
}
wg.Add(1)
go func(bbb *Blog) {
Expand All @@ -77,7 +77,7 @@ func (h *MCHandler) GetAdminBlogList(w http.ResponseWriter, r *http.Request) {
h.Log.Debug("commentCnt: ", len(*cl))
bbb.CommentCnt = len(*cl)
h.Log.Debug("Comments Done: ")
}(&bb)
}(&abb)
wg.Add(1)
go func(bbb *Blog) {
defer wg.Done()
Expand All @@ -90,7 +90,7 @@ func (h *MCHandler) GetAdminBlogList(w http.ResponseWriter, r *http.Request) {
h.Log.Debug("likeCnt: ", len(*ll))
bbb.LikeCnt = len(*ll)
h.Log.Debug("Views Done: ")
}(&bb)
}(&abb)

wg.Add(1)
go func(bbb *Blog) {
Expand All @@ -100,11 +100,11 @@ func (h *MCHandler) GetAdminBlogList(w http.ResponseWriter, r *http.Request) {
bbb.User = u1
bbb.UserImage = b64.StdEncoding.EncodeToString(bbb.User.Image)
h.Log.Debug("User Done: ")
}(&bb)
}(&abb)

wg.Wait()

blst = append(blst, bb)
blst = append(blst, abb)
}
bp.BlogList = &blst
h.Log.Debug("after all waits")
Expand All @@ -120,21 +120,21 @@ func (h *MCHandler) GetAdminBlogList(w http.ResponseWriter, r *http.Request) {
// ActivateBlog ActivateBlog
func (h *MCHandler) ActivateBlog(w http.ResponseWriter, r *http.Request) {
fmt.Println("in Activate Blog")
s, suc := h.getSession(r)
aas, suc := h.getSession(r)
h.Log.Debug("session suc in Activate Blog", suc)
if suc {
loggedInAuth := s.Get("loggedIn")
var isAdmin = s.Get("isAdmin")
loggedInAuth := aas.Get("loggedIn")
var isAdmin = aas.Get("isAdmin")
h.Log.Debug("loggedIn in Activate Blog: ", loggedInAuth)
if loggedInAuth == true && isAdmin == true {
vars := mux.Vars(r)
bidStr := vars["bid"]
aavars := mux.Vars(r)
bidStr := aavars["bid"]
h.Log.Debug("bid in Activate Blog: ", bidStr)
bid, _ := strconv.ParseInt(bidStr, 10, 64)

var abb mcd.Blog
abb.ID = bid
res := h.Delegate.ActivateBlog(&abb)
var aabb mcd.Blog
aabb.ID = bid
res := h.Delegate.ActivateBlog(&aabb)
if !res.Success {
h.Log.Debug("add Activate Blog suc: ", res.Success)
h.Log.Debug("add Activate Blog code: ", res.Code)
Expand All @@ -149,22 +149,22 @@ func (h *MCHandler) ActivateBlog(w http.ResponseWriter, r *http.Request) {
// DeactivateBlog DeactivateBlog
func (h *MCHandler) DeactivateBlog(w http.ResponseWriter, r *http.Request) {
fmt.Println("in Dectivate Blog")
s, suc := h.getSession(r)
ads, suc := h.getSession(r)
h.Log.Debug("session suc in Dectivate Blog", suc)
if suc {
loggedInAuth := s.Get("loggedIn")
var isAdmin = s.Get("isAdmin")
loggedInAuth := ads.Get("loggedIn")
var isAdmin = ads.Get("isAdmin")
h.Log.Debug("loggedIn in Dectivate Blog: ", loggedInAuth)
if loggedInAuth == true && isAdmin == true {
vars := mux.Vars(r)
bidStr := vars["bid"]
advars := mux.Vars(r)
bidStr := advars["bid"]
h.Log.Debug("bid: ", bidStr)
bid, _ := strconv.ParseInt(bidStr, 10, 64)

var dbb mcd.Blog
dbb.ID = bid
var adbb mcd.Blog
adbb.ID = bid

res := h.Delegate.DeActivateBlog(&dbb)
res := h.Delegate.DeActivateBlog(&adbb)
if !res.Success {
h.Log.Debug("add Dectivate Blog suc: ", res.Success)
h.Log.Debug("add Dectivate Blog code: ", res.Code)
Expand All @@ -179,22 +179,22 @@ func (h *MCHandler) DeactivateBlog(w http.ResponseWriter, r *http.Request) {
// DeleteBlog DeleteBlog
func (h *MCHandler) DeleteBlog(w http.ResponseWriter, r *http.Request) {
fmt.Println("in Delete Blog")
s, suc := h.getSession(r)
adds, suc := h.getSession(r)
h.Log.Debug("session suc in Delete Blog", suc)
if suc {
loggedInAuth := s.Get("loggedIn")
var isAdmin = s.Get("isAdmin")
loggedInAuth := adds.Get("loggedIn")
var isAdmin = adds.Get("isAdmin")
h.Log.Debug("loggedIn in Delete Blog: ", loggedInAuth)
if loggedInAuth == true && isAdmin == true {
vars := mux.Vars(r)
bidStr := vars["bid"]
addvars := mux.Vars(r)
bidStr := addvars["bid"]
h.Log.Debug("bid: ", bidStr)
bid, _ := strconv.ParseInt(bidStr, 10, 64)

res := h.Delegate.DeleteBlog(bid)
if !res.Success {
h.Log.Debug("add Delete Blog suc: ", res.Success)
h.Log.Debug("add Delete Blog code: ", res.Code)
addres := h.Delegate.DeleteBlog(bid)
if !addres.Success {
h.Log.Debug("add Delete Blog suc: ", addres.Success)
h.Log.Debug("add Delete Blog code: ", addres.Code)
}
http.Redirect(w, r, adminBlogListRt, http.StatusFound)

Expand Down
Loading

0 comments on commit 7d0f8fa

Please sign in to comment.