Merge pull request #60 from Ygg-Drasill/merge-failure-fix

Merge failure fix

backend/api/handlers/notificationHandler.go

@@ -24,7 +24,7 @@ type GetFilteredNotificationsRequest struct {
 //	@Produce		json
 //	@Success		200	{array}	Notification
 //	@Router			/notification/getFiltered [get]
-func (db *DbContext) GetNotifications(ctx *gin.Context) {
+func (db *DbContext) GetNotificationsFiltered(ctx *gin.Context) {
 	var request GetFilteredNotificationsRequest
 	err := ctx.ShouldBindQuery(&request)
 	if err != nil {

backend/api/handlers/penaltyHandlers.go

@@ -5,6 +5,7 @@ import (
 	"github.com/Ygg-Drasill/PenaltyThing/backend/models"
 	"github.com/gin-gonic/gin"
 	"net/http"
+	"strings"
 )
 
 type AddPenaltyRequest struct {
@@ -59,6 +60,22 @@ type GetPenaltyHistoryResponse struct {
 	PenaltyEntries models.PenaltyEntry `json:"penaltyEntries"`
 } //	@name	GetPenaltyHistoryResponse
 
+// Get
+//
+//	@Id			get
+//	@Param		ids	query	string	true	"ids"
+//	@Success	200	{array}	PenaltyEntry
+//	@Router		/penalty/get [get]
+func (db *DbContext) Get(ctx *gin.Context) {
+	ids := ctx.Param("ids")
+	idList := strings.Split(ids, ",")
+	penaltyEntriesResult, err := db.repo.GetPenaltiesById(idList)
+	if err != nil {
+		ctx.String(http.StatusInternalServerError, err.Error())
+	}
+	ctx.JSON(http.StatusOK, penaltyEntriesResult)
+}
+
 // GetPenaltyHistory
 //
 //	@Id			getPenaltyHistory

backend/main.go

@@ -81,7 +81,7 @@ func main() {
 
 		notification := v1.Group("/notification")
 		{
-			notification.GET("/getFiltered", dbContext.GetNotifications)
+			notification.GET("/getFiltered", dbContext.GetNotificationsFiltered)
 		}
 
 		health := v1.Group("/health")

backend/repository/invitation.go

@@ -30,7 +30,7 @@ func (repo *Repository) GetInvitationById(id string) (*models.Invitation, error)
 }
 
 func (repo *Repository) DeleteInvitation(id string) error {
-	res := repo.db.Delete(&models.Invitation{}, id)
+	res := repo.db.Delete(&models.Invitation{Id: id})
 	if res.Error != nil {
 		return res.Error
 	}

backend/repository/lawRepository.go

@@ -48,7 +48,7 @@ func (repo *Repository) UpdateLaw(law models.Law) error {
 }
 
 func (repo *Repository) DeleteLawById(lawId string) error {
-	res := repo.db.Delete(&models.Law{}, lawId)
+	res := repo.db.Delete(&models.Law{Id: lawId})
 	if res.Error != nil {
 		return res.Error
 	}

backend/repository/notificationRepository.go

@@ -32,7 +32,7 @@ func (repo *Repository) GetNotificationsByUserId(userId string) ([]models.Notifi
 }
 
 func (repo *Repository) DeleteNotification(id string) error {
-	res := repo.db.Delete(&models.Notification{}, id)
+	res := repo.db.Delete(&models.Notification{Id: id})
 	if res.Error != nil {
 		return res.Error
 	}

backend/repository/penaltyRepository.go

@@ -34,3 +34,13 @@ func (repo *Repository) GetPenaltiesByUserId(userId string) ([]models.PenaltyEnt
 	}
 	return penalties, nil
 }
+
+func (repo *Repository) GetPenaltiesById(ids []string) ([]models.PenaltyEntry, error) {
+	var penalties []models.PenaltyEntry
+	var err error
+	err = repo.db.Find(&penalties, ids).Error
+	if err != nil {
+		return nil, err
+	}
+	return penalties, nil
+}

frontend/src/components/NotificationList.tsx

@@ -1,8 +1,9 @@
 import { Button, CircularProgress, IconButton, LinearProgress, Stack, Typography } from '@mui/material'
-import useAppContext from './hooks/appContext'
+import useAppContext, { AppContext } from './hooks/appContext'
 import { useInvitationServiceAcceptInvitation } from './openapi/queries'
 import { Check, Clear } from '@mui/icons-material'
 import { Notification } from './openapi/requests'
+import { useQueryClient } from '@tanstack/react-query'
 
 function bytesToString(bytes: number[]): string {
 	const str = atob(bytes.toString())
@@ -11,15 +12,22 @@ function bytesToString(bytes: number[]): string {
 
 function InvitationNotification(props: { notification: Notification }) {
 	const acceptInvitation = useInvitationServiceAcceptInvitation()
-
+	const client = useQueryClient()
 	const onClickAccept = () => {
-		acceptInvitation.mutate({
-			request: {
-				invitationId: bytesToString(props.notification.data),
-				userId: props.notification.receiverId,
-				notificationId: props.notification.id,
+		acceptInvitation.mutate(
+			{
+				request: {
+					invitationId: bytesToString(props.notification.data),
+					userId: props.notification.receiverId,
+					notificationId: props.notification.id,
+				},
+			},
+			{
+				onSuccess: () => {
+					client.invalidateQueries({ queryKey: ['NotificationServiceGetFiltered'] })
+				},
 			},
-		})
+		)
 	}
 
 	const onClickClear = () => {}