personal messages added to cabinet

internal/handler/staticHelperHendlers.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"sort"
 	"strconv"
 	"strings"
 
@@ -121,11 +122,24 @@ func (m *Repository) PersonaCabinetHandler(w http.ResponseWriter, r *http.Reques
 			return
 		}
 
+		sendedPMS, err := m.DB.GetPMbysenderUserID(userID)
+		if err != nil {
+			setErrorAndRedirect(w, r, "Could not get sended PMS"+err.Error(), "/error-page")
+			return
+		}
+		var sortedPMs = sortingPMsByDate(append(receivedPMS, sendedPMS...))
+		sortedPMsWithNames, err := AddNamesToPMs(sortedPMs, m)
+
+		if err != nil {
+			setErrorAndRedirect(w, r, "Could not get names for PMS"+err.Error(), "/error-page")
+			return
+		}
+
 		data := make(map[string]interface{})
 		data["personal"] = personalInfo
 		data["totalPosts"] = totalPosts
 		data["loggedAsID"] = sessionUserID
-		data["receivedPMS"] = receivedPMS
+		data["sortedPMs"] = sortedPMsWithNames
 
 		renderer.RendererTemplate(w, "personal.page.html", &models.TemplateData{
 			Data: data,
@@ -136,6 +150,32 @@ func (m *Repository) PersonaCabinetHandler(w http.ResponseWriter, r *http.Reques
 	}
 }
 
+func AddNamesToPMs(pms []models.PM, m *Repository) ([]models.PM, error) {
+
+	for i, pm := range pms {
+		sender, err := m.DB.GetUserByID(pm.SenderUserID)
+		if err != nil {
+			return pms, err
+		}
+		receiver, err := m.DB.GetUserByID(pm.ReceiverUserID)
+		if err != nil {
+			return pms, err
+		}
+		pms[i].SenderName = sender.UserName
+		pms[i].ReceiverName = receiver.UserName
+	}
+	return pms, nil
+}
+
+func sortingPMsByDate(pms []models.PM) []models.PM {
+
+	// Define the custom sorting function
+	sort.Slice(pms, func(i, j int) bool {
+		return pms[i].Created.Before(pms[j].Created)
+	})
+	return pms
+}
+
 // GetAllThreadsForUserHandler gets all threads from user (user id)
 func (m *Repository) GetAllThreadsForUserHandler(w http.ResponseWriter, r *http.Request) {
 	sessionUserID := m.GetLoggedUser(w, r)

internal/models/models.go

@@ -93,4 +93,6 @@ type PM struct {
 	Created        time.Time
 	SenderUserID   int
 	ReceiverUserID int
+	SenderName     string
+	ReceiverName   string
 }

internal/renderer/render.go

@@ -40,6 +40,9 @@ var functions = template.FuncMap{
 	"convertTimeTopic": func(topic models.Thread) string {
 		return topic.Created.Format("2006-01-02 15:04:05")
 	},
+	"convertTimePM": func(pm models.PM) string {
+		return pm.Created.Format("2006-01-02 15:04:05")
+	},
 	"shortenPost": func(allPosts []models.Post) string {
 		var latestPost2 models.Post
 		latestPost2.Created, _ = time.Parse("2006-01-02 15:04:05", "2006-01-02 15:04:05")

template/personal.page.html

@@ -118,6 +118,33 @@ <h2>User Profile</h2>
                 {{end}}
             </tbody>
         </table>
+        <div>
+            {{if and (eq $loggedID $person.ID) (ne $loggedID 1)}}
+            <table class="table-borderless forumTable whiteLink mt-3">
+                <thead>
+                    <tr>
+                        <th scope="col">Date</th>
+                        <th scope="col">Message</th>
+                        <th scope="col">Remitent</th>
+                        <th scope="col">Receiver</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {{$sortedPM := index .Data "sortedPMs"}}
+                    {{range $sortedPM}}
+                    <tr>
+                        {{$convertedTime := convertTimePM . }}
+                        <th scope="row"><hr>{{$convertedTime}}</th>
+                        <td><hr>{{.Content}}</td>
+                        <td><hr>{{.SenderName}}</td>
+                        <td><hr>{{.ReceiverName}}</td>
+                    </tr>
+
+                    {{end}}
+                </tbody>
+            </table>
+            {{end}}
+        </div>
     </div>
 </div>
 </div>