Skip to content

Commit

Permalink
Merge pull request #36 from team-inu/development
Browse files Browse the repository at this point in the history 
Fix error when send gpax to zero in update student
  • Loading branch information
@Porping
Porping authored Mar 20, 2024
2 parents 7833cb3 + 1f06d12 commit 6981559
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 40 deletions.
29 changes: 15 additions & 14 deletions infrastructure/fiber/controller/student.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package controller

import (
"fmt"

"github.com/gofiber/fiber/v2"
"github.com/team-inu/inu-backyard/entity"
"github.com/team-inu/inu-backyard/infrastructure/fiber/request"
Expand Down Expand Up @@ -80,10 +82,10 @@ func (c studentController) Create(ctx *fiber.Ctx) error {
Email: payload.Email,
ProgrammeName: payload.ProgrammeName,
DepartmentName: payload.DepartmentName,
GPAX: payload.GPAX,
MathGPA: payload.MathGPA,
EngGPA: payload.EngGPA,
SciGPA: payload.SciGPA,
GPAX: *payload.GPAX,
MathGPA: *payload.MathGPA,
EngGPA: *payload.EngGPA,
SciGPA: *payload.SciGPA,
School: payload.School,
City: payload.City,
Year: payload.Year,
Expand Down Expand Up @@ -113,10 +115,10 @@ func (c studentController) CreateMany(ctx *fiber.Ctx) error {
LastName: student.LastName,
ProgrammeName: student.ProgrammeName,
DepartmentName: student.DepartmentName,
GPAX: student.GPAX,
MathGPA: student.MathGPA,
EngGPA: student.EngGPA,
SciGPA: student.SciGPA,
GPAX: *student.GPAX,
MathGPA: *student.MathGPA,
EngGPA: *student.EngGPA,
SciGPA: *student.SciGPA,
School: student.School,
Year: student.Year,
Admission: student.Admission,
Expand All @@ -135,23 +137,22 @@ func (c studentController) CreateMany(ctx *fiber.Ctx) error {

func (c studentController) Update(ctx *fiber.Ctx) error {
var payload request.UpdateStudentPayload

if ok, err := c.Validator.Validate(&payload, ctx); !ok {
return err
}
fmt.Println("sadfadsfadfsafdsfdsadfs")

id := ctx.Params("studentId")

err := c.studentUseCase.Update(id, &entity.Student{
Id: payload.KmuttId,
FirstName: payload.FirstName,
LastName: payload.LastName,
ProgrammeName: payload.ProgrammeName,
DepartmentName: payload.DepartmentName,
GPAX: payload.GPAX,
MathGPA: payload.MathGPA,
EngGPA: payload.EngGPA,
SciGPA: payload.SciGPA,
GPAX: *payload.GPAX,
MathGPA: *payload.MathGPA,
EngGPA: *payload.EngGPA,
SciGPA: *payload.SciGPA,
School: payload.School,
Year: payload.Year,
Admission: payload.Admission,
Expand Down
52 changes: 26 additions & 26 deletions infrastructure/fiber/request/student.go
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package request

type CreateStudentPayload struct {
KmuttId string `json:"kmuttId" validate:"required"`
FirstName string `json:"firstName" validate:"required"`
LastName string `json:"lastName" validate:"required"`
GPAX float64 `json:"gpax" validate:"required"`
MathGPA float64 `json:"mathGPA" validate:"required"`
EngGPA float64 `json:"engGPA" validate:"required"`
SciGPA float64 `json:"sciGPA" validate:"required"`
School string `json:"school" validate:"required"`
City string `json:"city" validate:"required"`
Email string `json:"email" validate:"required"`
Year string `json:"year" validate:"required"`
Admission string `json:"admission" validate:"required"`
Remark string `json:"remark"`
KmuttId string `json:"kmuttId" validate:"required"`
FirstName string `json:"firstName" validate:"required"`
LastName string `json:"lastName" validate:"required"`
GPAX *float64 `json:"gpax" validate:"required"`
MathGPA *float64 `json:"mathGPA" validate:"required"`
EngGPA *float64 `json:"engGPA" validate:"required"`
SciGPA *float64 `json:"sciGPA" validate:"required"`
School string `json:"school" validate:"required"`
City string `json:"city" validate:"required"`
Email string `json:"email" validate:"required"`
Year string `json:"year" validate:"required"`
Admission string `json:"admission" validate:"required"`
Remark string `json:"remark"`

ProgrammeName string `json:"programmeName" validate:"required"`
DepartmentName string `json:"departmentName" validate:"required"`
Expand All @@ -30,19 +30,19 @@ type CreateBulkStudentsPayload struct {
}

type UpdateStudentPayload struct {
KmuttId string `json:"kmuttId" validate:"required"`
FirstName string `json:"firstName" validate:"required"`
LastName string `json:"lastName" validate:"required"`
GPAX float64 `json:"gpax" validate:"required"`
MathGPA float64 `json:"mathGPA" validate:"required"`
EngGPA float64 `json:"engGPA" validate:"required"`
SciGPA float64 `json:"sciGPA" validate:"required"`
School string `json:"school" validate:"required"`
City string `json:"city" validate:"required"`
Email string `json:"email" validate:"required"`
Year string `json:"year" validate:"required"`
Admission string `json:"admission" validate:"required"`
Remark *string `json:"remark" validate:"required"`
KmuttId string `json:"kmuttId" validate:"required"`
FirstName string `json:"firstName" validate:"required"`
LastName string `json:"lastName" validate:"required"`
GPAX *float64 `json:"gpax" validate:"required"`
MathGPA *float64 `json:"mathGPA" validate:"required"`
EngGPA *float64 `json:"engGPA" validate:"required"`
SciGPA *float64 `json:"sciGPA" validate:"required"`
School string `json:"school" validate:"required"`
City string `json:"city" validate:"required"`
Email string `json:"email" validate:"required"`
Year string `json:"year" validate:"required"`
Admission string `json:"admission" validate:"required"`
Remark *string `json:"remark" validate:"required"`

ProgrammeName string `json:"programmeName" validate:"required"`
DepartmentName string `json:"departmentName" validate:"required"`
Expand Down

0 comments on commit 6981559

Please sign in to comment.