release: v0.40.0

CHANGELOG.md

@@ -1,45 +1,45 @@
-# [0.37.0](https://github.com/upb-code-labs/main-api/compare/v0.36.0...v0.37.0) (2023-12-30)
+# [0.40.0](https://github.com/upb-code-labs/main-api/compare/v0.39.0...v0.40.0) (2023-12-30)
 
 
 ### Features
 
-* Update test block ([#127](https://github.com/upb-code-labs/main-api/issues/127)) ([fa8c816](https://github.com/upb-code-labs/main-api/commit/fa8c816083650039ae831daeff69c8e65689796a))
+* Delete test block ([#132](https://github.com/upb-code-labs/main-api/issues/132)) ([3ddaa80](https://github.com/upb-code-labs/main-api/commit/3ddaa80089b3e88404bfa0f92070d5f1e21722de))
 
 
 
-# [0.36.0](https://github.com/upb-code-labs/main-api/compare/v0.35.0...v0.36.0) (2023-12-29)
+# [0.39.0](https://github.com/upb-code-labs/main-api/compare/v0.38.0...v0.39.0) (2023-12-30)
 
 
 ### Features
 
-* Create new test block ([#126](https://github.com/upb-code-labs/main-api/issues/126)) ([ae8c2ba](https://github.com/upb-code-labs/main-api/commit/ae8c2ba50914ec235cecb0a41784736f2a4692ac))
+* Delete markdown block ([#131](https://github.com/upb-code-labs/main-api/issues/131)) ([1aee6d6](https://github.com/upb-code-labs/main-api/commit/1aee6d6c4509953aa03d1d449cb173a916eedc27))
 
 
 
-# [0.35.0](https://github.com/upb-code-labs/main-api/compare/v0.34.0...v0.35.0) (2023-12-28)
+# [0.38.0](https://github.com/upb-code-labs/main-api/compare/v0.37.0...v0.38.0) (2023-12-30)
 
 
 ### Features
 
-* Download languages template ([#123](https://github.com/upb-code-labs/main-api/issues/123)) ([4f460f4](https://github.com/upb-code-labs/main-api/commit/4f460f41a90f38516b6dad38f40a97f5245efb99))
+* Update status of enrolled students ([#129](https://github.com/upb-code-labs/main-api/issues/129)) ([0797e01](https://github.com/upb-code-labs/main-api/commit/0797e01e7795c2c46065c33b3c6549f3136dd95e))
 
 
 
-# [0.34.0](https://github.com/upb-code-labs/main-api/compare/v0.33.0...v0.34.0) (2023-12-28)
+# [0.37.0](https://github.com/upb-code-labs/main-api/compare/v0.36.0...v0.37.0) (2023-12-30)
 
 
 ### Features
 
-* List supported languages ([#122](https://github.com/upb-code-labs/main-api/issues/122)) ([e7d7539](https://github.com/upb-code-labs/main-api/commit/e7d75396b242cdebc046d62ca184522bcfbb2ae2))
+* Update test block ([#127](https://github.com/upb-code-labs/main-api/issues/127)) ([fa8c816](https://github.com/upb-code-labs/main-api/commit/fa8c816083650039ae831daeff69c8e65689796a))
 
 
 
-# [0.33.0](https://github.com/upb-code-labs/main-api/compare/v0.32.0...v0.33.0) (2023-11-29)
+# [0.36.0](https://github.com/upb-code-labs/main-api/compare/v0.35.0...v0.36.0) (2023-12-29)
 
 
 ### Features
 
-* Update markdown block content ([#113](https://github.com/upb-code-labs/main-api/issues/113)) ([3a6f762](https://github.com/upb-code-labs/main-api/commit/3a6f762a1c5e1e3915bee380438803b0ce981aac))
+* Create new test block ([#126](https://github.com/upb-code-labs/main-api/issues/126)) ([ae8c2ba](https://github.com/upb-code-labs/main-api/commit/ae8c2ba50914ec235cecb0a41784736f2a4692ac))
 
 
 

__tests__/integration/blocks_test.go

@@ -27,7 +27,7 @@ func TestUpdateMarkdownBlockContent(t *testing.T) {
 		"name":         "Update markdown block content test - laboratory",
 		"course_uuid":  courseUUID,
 		"opening_date": "2023-12-01T08:00",
-		"due_date":     "2023-12-01T12:00",
+		"due_date":     "3023-12-01T12:00",
 	})
 	c.Equal(http.StatusCreated, status)
 	laboratoryUUID := laboratoryCreationResponse["uuid"].(string)
@@ -68,6 +68,51 @@ func TestUpdateMarkdownBlockContent(t *testing.T) {
 	c.Equal("# Updated main title", block["content"].(string))
 }
 
+func TestDeleteMarkdownBlock(t *testing.T) {
+	c := require.New(t)
+
+	// Login as a teacher
+	w, r := PrepareRequest("POST", "/api/v1/session/login", map[string]interface{}{
+		"email":    registeredTeacherEmail,
+		"password": registeredTeacherPass,
+	})
+	router.ServeHTTP(w, r)
+	cookie := w.Result().Cookies()[0]
+
+	// Create a course
+	courseUUID, status := CreateCourse("Delete markdown block test - course")
+	c.Equal(http.StatusCreated, status)
+
+	// Create a laboratory
+	laboratoryCreationResponse, status := CreateLaboratory(cookie, map[string]interface{}{
+		"name":         "Delete markdown block test - laboratory",
+		"course_uuid":  courseUUID,
+		"opening_date": "2023-12-01T08:00",
+		"due_date":     "3023-12-01T12:00",
+	})
+	c.Equal(http.StatusCreated, status)
+	laboratoryUUID := laboratoryCreationResponse["uuid"].(string)
+
+	// Create a markdown block
+	blockCreationResponse, status := CreateMarkdownBlock(cookie, laboratoryUUID)
+	c.Equal(http.StatusCreated, status)
+	markdownBlockUUID := blockCreationResponse["uuid"].(string)
+
+	// Get the laboratory
+	response, status := GetLaboratoryByUUID(cookie, laboratoryUUID)
+	c.Equal(http.StatusOK, status)
+	c.Equal(1, len(response["markdown_blocks"].([]interface{})))
+
+	// Delete the markdown block
+	_, status = DeleteMarkdownBlock(cookie, markdownBlockUUID)
+	c.Equal(http.StatusNoContent, status)
+
+	// Verify that the block was deleted
+	response, status = GetLaboratoryByUUID(cookie, laboratoryUUID)
+	c.Equal(http.StatusOK, status)
+	c.Equal(0, len(response["markdown_blocks"].([]interface{})))
+}
+
 func TestUpdateTestBlock(t *testing.T) {
 	c := require.New(t)
 
@@ -142,3 +187,71 @@ func TestUpdateTestBlock(t *testing.T) {
 	c.Equal(newName, block["name"].(string))
 	c.Equal(firstLanguageUUID, block["language_uuid"].(string))
 }
+
+func TestDeleteTestBlock(t *testing.T) {
+	c := require.New(t)
+
+	// Login as a teacher
+	w, r := PrepareRequest("POST", "/api/v1/session/login", map[string]interface{}{
+		"email":    registeredTeacherEmail,
+		"password": registeredTeacherPass,
+	})
+	router.ServeHTTP(w, r)
+	cookie := w.Result().Cookies()[0]
+
+	// Create a course
+	courseUUID, status := CreateCourse("Delete test block test - course")
+	c.Equal(http.StatusCreated, status)
+
+	// Create a laboratory
+	laboratoryCreationResponse, status := CreateLaboratory(cookie, map[string]interface{}{
+		"name":         "Delete test block test - laboratory",
+		"course_uuid":  courseUUID,
+		"opening_date": "2023-12-01T08:00",
+		"due_date":     "3023-12-01T00:00",
+	})
+	c.Equal(http.StatusCreated, status)
+	laboratoryUUID := laboratoryCreationResponse["uuid"].(string)
+
+	// Get the supported languages
+	languagesResponse, status := GetSupportedLanguages(cookie)
+	c.Equal(http.StatusOK, status)
+
+	languages := languagesResponse["languages"].([]interface{})
+	c.Greater(len(languages), 0)
+
+	firstLanguage := languages[0].(map[string]interface{})
+	firstLanguageUUID := firstLanguage["uuid"].(string)
+
+	// Create a test block
+	zipFile, err := GetSampleTestsArchive()
+	c.Nil(err)
+
+	blockCreationResponse, status := CreateTestBlock(&CreateTestBlockUtilsDTO{
+		laboratoryUUID: laboratoryUUID,
+		languageUUID:   firstLanguageUUID,
+		blockName:      "Delete test block test - block",
+		cookie:         cookie,
+		testFile:       zipFile,
+	})
+	c.Equal(http.StatusCreated, status)
+	testBlockUUID := blockCreationResponse["uuid"].(string)
+
+	// Check that the test block was created
+	laboratoryResponse, status := GetLaboratoryByUUID(cookie, laboratoryUUID)
+	c.Equal(http.StatusOK, status)
+
+	blocks := laboratoryResponse["test_blocks"].([]interface{})
+	c.Equal(1, len(blocks))
+
+	// Delete the test block
+	_, status = DeleteTestBlock(cookie, testBlockUUID)
+	c.Equal(http.StatusNoContent, status)
+
+	// Check that the test block was deleted
+	laboratoryResponse, status = GetLaboratoryByUUID(cookie, laboratoryUUID)
+	c.Equal(http.StatusOK, status)
+
+	blocks = laboratoryResponse["test_blocks"].([]interface{})
+	c.Equal(0, len(blocks))
+}

__tests__/integration/blocks_utils_test.go

@@ -20,6 +20,16 @@ func UpdateMarkdownBlockContent(cookie *http.Cookie, blockUUID string, payload m
 	return jsonResponse, w.Code
 }
 
+func DeleteMarkdownBlock(cookie *http.Cookie, blockUUID string) (response map[string]interface{}, statusCode int) {
+	endpoint := fmt.Sprintf("/api/v1/blocks/markdown_blocks/%s", blockUUID)
+	w, r := PrepareRequest("DELETE", endpoint, nil)
+	r.AddCookie(cookie)
+	router.ServeHTTP(w, r)
+
+	jsonResponse := ParseJsonResponse(w.Body)
+	return jsonResponse, w.Code
+}
+
 type UpdateTestBlockUtilsDTO struct {
 	blockUUID    string
 	languageUUID string
@@ -74,3 +84,13 @@ func UpdateTestBlock(dto *UpdateTestBlockUtilsDTO) (response map[string]interfac
 	jsonResponse := ParseJsonResponse(w.Body)
 	return jsonResponse, w.Code
 }
+
+func DeleteTestBlock(cookie *http.Cookie, blockUUID string) (response map[string]interface{}, statusCode int) {
+	endpoint := fmt.Sprintf("/api/v1/blocks/test_blocks/%s", blockUUID)
+	w, r := PrepareRequest("DELETE", endpoint, nil)
+	r.AddCookie(cookie)
+	router.ServeHTTP(w, r)
+
+	jsonResponse := ParseJsonResponse(w.Body)
+	return jsonResponse, w.Code
+}

__tests__/integration/courses_test.go

@@ -679,3 +679,49 @@ func TestGetCourseLaboratories(t *testing.T) {
 		}
 	}
 }
+
+func TestSetStudentStatus(t *testing.T) {
+	c := require.New(t)
+
+	// 1. Create a course
+	courseUUID, code := CreateCourse("Set student status test - course")
+	c.Equal(http.StatusCreated, code)
+
+	// 2. Get the course invitation code
+	invitationCode, code := GetInvitationCode(courseUUID)
+	c.Equal(http.StatusOK, code)
+
+	// 3. Add a student to the course
+	_, code = AddStudentToCourse(invitationCode)
+	c.Equal(http.StatusOK, code)
+
+	// 4. Login as a teacher
+	w, r := PrepareRequest("POST", "/api/v1/session/login", map[string]interface{}{
+		"email":    registeredTeacherEmail,
+		"password": registeredTeacherPass,
+	})
+	router.ServeHTTP(w, r)
+	cookie := w.Result().Cookies()[0]
+
+	// 5. Get the student uuid
+	students, code := GetStudentsEnrolledInCourse(cookie, courseUUID)
+	c.Equal(http.StatusOK, code)
+	c.Equal(1, len(students["students"].([]interface{})))
+	studentUUID := students["students"].([]interface{})[0].(map[string]interface{})["uuid"].(string)
+
+	// 6. Set the student status
+	code = SetStudentStatus(&SetStudentStatusUtilsDTO{
+		CourseUUID:  courseUUID,
+		StudentUUID: studentUUID,
+		IsActive:    false,
+		Cookie:      cookie,
+	})
+	c.Equal(http.StatusNoContent, code)
+
+	// 7. Get the student status
+	students, code = GetStudentsEnrolledInCourse(cookie, courseUUID)
+	c.Equal(http.StatusOK, code)
+	c.Equal(1, len(students["students"].([]interface{})))
+	student := students["students"].([]interface{})[0].(map[string]interface{})
+	c.Equal(false, student["is_active"])
+}

__tests__/integration/courses_utils_test.go

@@ -133,3 +133,21 @@ func GetCourseLaboratories(cookie *http.Cookie, courseUUID string) (response map
 	jsonResponse := ParseJsonResponse(w.Body)
 	return jsonResponse, w.Code
 }
+
+type SetStudentStatusUtilsDTO struct {
+	CourseUUID  string
+	StudentUUID string
+	IsActive    bool
+	Cookie      *http.Cookie
+}
+
+func SetStudentStatus(dto *SetStudentStatusUtilsDTO) (statusCode int) {
+	endpoint := fmt.Sprintf("/api/v1/courses/%s/students/%s/status", dto.CourseUUID, dto.StudentUUID)
+	w, r := PrepareRequest("PATCH", endpoint, map[string]interface{}{
+		"is_active": dto.IsActive,
+	})
+	r.AddCookie(dto.Cookie)
+	router.ServeHTTP(w, r)
+
+	return w.Code
+}

__tests__/integration/laboratorires_test.go

@@ -38,7 +38,7 @@ func TestCreateLaboratory(t *testing.T) {
 				"name":         "Create laboratory test - laboratory",
 				"course_uuid":  courseUUID,
 				"opening_date": "2023-12-01T08:00",
-				"due_date":     "2023-12-01T12:00",
+				"due_date":     "3023-12-01T12:00",
 			},
 			ExpectedStatusCode: http.StatusCreated,
 		},
@@ -231,7 +231,7 @@ func TestCreateMarkdownBlock(t *testing.T) {
 		"name":         "Create markdown block test - laboratory",
 		"course_uuid":  courseUUID,
 		"opening_date": "2023-12-01T08:00",
-		"due_date":     "2023-12-01T12:00",
+		"due_date":     "3023-12-01T12:00",
 	})
 	laboratoryUUID := laboratoryCreationResponse["uuid"].(string)
 	c.Equal(http.StatusCreated, status)

__tests__/integration/main_test.go

@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/UPB-Code-Labs/main-api/src/accounts/infrastructure/requests"
-	config_infrastructure "github.com/UPB-Code-Labs/main-api/src/config/infrastructure"
-	shared_infrastructure "github.com/UPB-Code-Labs/main-api/src/shared/infrastructure"
+	configInfrastructure "github.com/UPB-Code-Labs/main-api/src/config/infrastructure"
+	sharedInfrastructure "github.com/UPB-Code-Labs/main-api/src/shared/infrastructure"
 	"github.com/gin-gonic/gin"
 )
 
@@ -40,7 +40,7 @@ type GenericTestCase struct {
 func TestMain(m *testing.M) {
 	// Setup database
 	setupDatabase()
-	defer shared_infrastructure.ClosePostgresConnection()
+	defer sharedInfrastructure.ClosePostgresConnection()
 
 	// Setup http router
 	setupRouter()
@@ -52,12 +52,12 @@ func TestMain(m *testing.M) {
 }
 
 func setupDatabase() {
-	shared_infrastructure.GetPostgresConnection()
-	config_infrastructure.RunMigrations()
+	sharedInfrastructure.GetPostgresConnection()
+	configInfrastructure.RunMigrations()
 }
 
 func setupRouter() {
-	router = config_infrastructure.InstanceHttpServer()
+	router = configInfrastructure.InstanceHttpServer()
 }
 
 func registerBaseAccounts() {

docs/bruno/blocks/delete-markdown-block.bru

@@ -0,0 +1,11 @@
+meta {
+  name: delete-markdown-block
+  type: http
+  seq: 2
+}
+
+delete {
+  url: {{BASE_URL}}/blocks/markdown_blocks/eb4ef0ee-3865-44c3-8d52-2620fb2653e5
+  body: none
+  auth: none
+}

docs/bruno/blocks/delete-test-block.bru

@@ -0,0 +1,11 @@
+meta {
+  name: delete-test-block
+  type: http
+  seq: 3
+}
+
+delete {
+  url: {{BASE_URL}}/blocks/test_blocks/eb4ef0ee-3865-44c3-8d52-2620fb2653e5
+  body: none
+  auth: none
+}

docs/bruno/courses/update-enrolled-student-status.bru

@@ -0,0 +1,11 @@
+meta {
+  name: update-enrolled-student-status
+  type: http
+  seq: 11
+}
+
+patch {
+  url: {{BASE_URL}}/courses/b6268472-d569-4f60-9d64-58441433e0b3/students
+  body: none
+  auth: none
+}