diff --git a/docs/docs.go b/docs/docs.go index 53551313022c11650b29700433fbe74ab2b3b930..871b248845409153343c58e51ff987f1e0a51702 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -2711,6 +2711,10 @@ const docTemplate = `{ "description": "Course ID", "type": "string" }, + "lecturer": { + "description": "Course Lecturer Name", + "type": "string" + }, "majabbr": { "description": "Course Major Abbreviation", "type": "string" @@ -2746,6 +2750,10 @@ const docTemplate = `{ "type": "string", "example": "someone@example.com" }, + "lecturer": { + "description": "Course Lecturer Name", + "type": "string" + }, "majabbr": { "description": "Course Major Abbreviation", "type": "string" diff --git a/docs/swagger.json b/docs/swagger.json index 1ac89a2a1a878a8494d4a79cea11328b62692ba1..c9f33d2ca67dda4eec4aac48b87103fc54b4643b 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -2703,6 +2703,10 @@ "description": "Course ID", "type": "string" }, + "lecturer": { + "description": "Course Lecturer Name", + "type": "string" + }, "majabbr": { "description": "Course Major Abbreviation", "type": "string" @@ -2738,6 +2742,10 @@ "type": "string", "example": "someone@example.com" }, + "lecturer": { + "description": "Course Lecturer Name", + "type": "string" + }, "majabbr": { "description": "Course Major Abbreviation", "type": "string" diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 83c7b9731375d19f28d0a6f5912cb80018776e5a..3735fa33ffe881d55c5c689d1272448bae9657c4 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -75,6 +75,9 @@ definitions: id: description: Course ID type: string + lecturer: + description: Course Lecturer Name + type: string majabbr: description: Course Major Abbreviation type: string @@ -102,6 +105,9 @@ definitions: description: Contributor Email example: someone@example.com type: string + lecturer: + description: Course Lecturer Name + type: string majabbr: description: Course Major Abbreviation type: string diff --git a/model/web/course/request.go b/model/web/course/request.go index f070a06a8dd18b23be95adb45bf6785f31c638cb..e1f84ca34394ce1fadf7f0c45a4f35cf3dbc8724 100644 --- a/model/web/course/request.go +++ b/model/web/course/request.go @@ -28,6 +28,9 @@ type AddCourseRequestPayload struct { // Course Name Abbreviation Abbreviation string `json:"abbreviation"` + + // Course Lecturer Name + Lecturer string `json:"lecturer"` } // DeleteCourse Request Payload @@ -40,7 +43,6 @@ type DeleteByStringRequestPayload struct { ID string `json:"-" validate:"required"` } - // GetID Request Payload // @Description Information that should be available when you get using course id (string) type GetByStringRequestPayload struct { @@ -81,6 +83,7 @@ type UpdateCourseRequestPayload struct { // Course Name Abbreviation Abbreviation string `json:"abbreviation"` -} - + // Course Lecturer Name + Lecturer string `json:"lecturer"` +} diff --git a/service/course/add.go b/service/course/add.go index a94a59b6e56c8d465adf46559d3877dff50b34e0..bbed9ccc8d3cf5996e5615f92a82e7b45ed62b29 100644 --- a/service/course/add.go +++ b/service/course/add.go @@ -61,6 +61,7 @@ func (c CourseServiceImpl) AddCourse(payload course.AddCourseRequestPayload) err Description: payload.Description, Email: payload.Email, Abbreviation: payload.Abbreviation, + Lecturer: payload.Lecturer, }) if err != nil { diff --git a/service/course/update.go b/service/course/update.go index 0ab6dcd07eb711318a548659dde7b6fa42e1fd90..757847e81512f580f8c3ebe192aa4d28e4e574e2 100644 --- a/service/course/update.go +++ b/service/course/update.go @@ -7,9 +7,9 @@ import ( "gitlab.informatika.org/ocw/ocw-backend/model/domain/user" "gitlab.informatika.org/ocw/ocw-backend/model/web" "gitlab.informatika.org/ocw/ocw-backend/model/web/auth/token" + "gitlab.informatika.org/ocw/ocw-backend/model/web/course" "gitlab.informatika.org/ocw/ocw-backend/model/web/course/faculty" "gitlab.informatika.org/ocw/ocw-backend/model/web/course/major" - "gitlab.informatika.org/ocw/ocw-backend/model/web/course" "gorm.io/gorm" ) @@ -45,12 +45,13 @@ func (c CourseServiceImpl) UpdateCourse(payload course.UpdateCourseRequestPayloa } err = c.CourseRepository.UpdateCourse(domCourse.Course{ - ID: payload.ID, - Name: payload.Name, - Major_id: payload.MajorID, - Description: payload.Description, - Email: payload.Email, + ID: payload.ID, + Name: payload.Name, + Major_id: payload.MajorID, + Description: payload.Description, + Email: payload.Email, Abbreviation: payload.Abbreviation, + Lecturer: payload.Lecturer, }) if err != nil { @@ -65,7 +66,7 @@ func (c CourseServiceImpl) UpdateCourse(payload course.UpdateCourseRequestPayloa } func (c CourseServiceImpl) UpdateMajor(payload major.UpdateMajorRequestPayload) error { - + // Validate Role claim, err := c.TokenUtil.Validate(payload.UpdateMajorToken, token.Access) @@ -93,11 +94,11 @@ func (c CourseServiceImpl) UpdateMajor(payload major.UpdateMajorRequestPayload) payload.FacultyID = faculty.ID } - + err = c.CourseRepository.UpdateMajor(domCourse.Major{ - ID: payload.ID, - Name: payload.Name, - Fac_id: payload.FacultyID, + ID: payload.ID, + Name: payload.Name, + Fac_id: payload.FacultyID, Abbreviation: payload.Abbreviation, }) @@ -125,10 +126,10 @@ func (c CourseServiceImpl) UpdateFaculty(payload faculty.UpdateFacultyRequestPay if claim.Role != user.Admin { return web.NewResponseErrorFromError(err, web.UnauthorizedAccess) } - + err = c.CourseRepository.UpdateFaculty(domCourse.Faculty{ - ID: payload.ID, - Name: payload.Name, + ID: payload.ID, + Name: payload.Name, Abbreviation: payload.Abbreviation, })