Skip to content

Commit

Permalink
Merge pull request #15 from stevebrownlee/develop
Browse files Browse the repository at this point in the history 
Support adding a Github org to a new cohort
  • Loading branch information
@stevebrownlee
stevebrownlee authored Jul 9, 2024
2 parents 15ae11e + 461529b commit 1625598
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 39 deletions.
106 changes: 67 additions & 39 deletions LearningAPI/views/cohort_view.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,20 @@ def create(self, request):
if client_side is None or server_side is None:
return Response({"reason": "Please choose both courses for this cohort."}, status=status.HTTP_400_BAD_REQUEST)

cohort = Cohort()
cohort.name = request.data["name"]
cohort.slack_channel = request.data["slackChannel"]
cohort.start_date = request.data["startDate"]
cohort.end_date = request.data["endDate"]
cohort.break_start_date = '2022-01-01'
cohort.break_end_date = '2022-01-01'

try:
cohort = Cohort()
cohort.name = request.data["name"]
cohort.slack_channel = request.data["slackChannel"]
cohort.start_date = request.data["startDate"]
cohort.end_date = request.data["endDate"]
cohort.break_start_date = '2022-01-01'
cohort.break_end_date = '2022-01-01'
cohort.save()
except IntegrityError as ex:
return Response({"message": ex.args[0]}, status=status.HTTP_400_BAD_REQUEST)

try:
# Assign client side course
cohort_course_client = CohortCourse()
course_instance = Course.objects.get(pk=client_side)
Expand All @@ -58,7 +61,10 @@ def create(self, request):
cohort_course_client.active = True
cohort_course_client.index = 0
cohort_course_client.save()
except IntegrityError:
pass

try:
# Assign server side course
cohort_course_server = CohortCourse()
course_instance = Course.objects.get(pk=server_side)
Expand All @@ -67,18 +73,20 @@ def create(self, request):
cohort_course_server.active = False
cohort_course_server.index = 1
cohort_course_server.save()
except IntegrityError:
pass

serializer = CohortSerializer(cohort, context={'request': request})
return Response(serializer.data, status=status.HTTP_201_CREATED)

try:
# Create matching cohort info
cohort_info = CohortInfo()
cohort_info.cohort = cohort
cohort_info.student_organization_url = request.data.get('orgURL', None)
cohort_info.save()
except IntegrityError as ex:
if "cohort_name_key" in ex.args[0]:
return Response({"reason": "Duplicate cohort name."}, status=status.HTTP_400_BAD_REQUEST)
else:
return Response({"reason": "Duplicate cohort Slack channel."}, status=status.HTTP_400_BAD_REQUEST)
return Response({"message": ex.args[0]}, status=status.HTTP_400_BAD_REQUEST)

except Exception as ex:
return Response({"reason": ex.args[0]}, status=status.HTTP_400_BAD_REQUEST)
serializer = CohortSerializer(cohort, context={'request': request})
return Response(serializer.data, status=status.HTTP_201_CREATED)

def retrieve(self, request, pk=None):
"""Handle GET requests for single item
Expand Down Expand Up @@ -111,8 +119,6 @@ def update(self, request, pk=None):
cohort.slack_channel = request.data["slack_channel"]
cohort.start_date = request.data["start_date"]
cohort.end_date = request.data["end_date"]
cohort.break_start_date = request.data["break_start_date"]
cohort.break_end_date = request.data["break_end_date"]

cohort.save()
except Cohort.DoesNotExist:
Expand Down Expand Up @@ -165,12 +171,13 @@ def list(self, request):
serializer = MiniCohortSerializer(cohorts, many=True, context={'request': request})
return Response(serializer.data, status=status.HTTP_200_OK)

cohorts = cohorts.annotate(
students=Count('members', filter=Q(
members__nss_user__user__is_staff=False)),
is_instructor=Count('members', filter=Q(
members__nss_user__user=request.auth.user)),
).all().order_by('pk')
cohorts = cohorts\
.annotate(
students=Count('members', filter=Q(members__nss_user__user__is_staff=False)),
is_instructor=Count('members', filter=Q(members__nss_user__user=request.auth.user))
)\
.all()\
.order_by('pk')

if limit is not None:
cohorts = cohorts.order_by("-start_date")[0:int(limit)]
Expand All @@ -185,7 +192,7 @@ def list(self, request):
def active(self, request, pk):
if request.method == "PUT":
cohort = Cohort.objects.get(pk=pk)
cohort.active = request.data.get('active', False)
cohort.active = request.data.get('active', True)
cohort.save()

return Response(None, status=status.HTTP_204_NO_CONTENT)
Expand All @@ -200,15 +207,19 @@ def migrate(self, request, pk):
if request.method == "PUT":
try:
client_side_course = CohortCourse.objects.get(
cohort__id=pk, active=True)
cohort__id=pk,
active=True
)
except CohortCourse.DoesNotExist:
return Response({
'reason': 'Could not find an active client side course for this cohort'
}, status=status.HTTP_404_NOT_FOUND)

try:
server_side_course = CohortCourse.objects.get(
cohort__id=pk, active=False)
cohort__id=pk,
active=False
)
except CohortCourse.DoesNotExist:
return Response({
'reason': 'Could not find an inactive server side course for this cohort'
Expand All @@ -217,7 +228,10 @@ def migrate(self, request, pk):
# Get first project of server side course
try:
first_project = Project.objects.get(
book__course=server_side_course.course, book__index=0, index=0)
book__course=server_side_course.course,
book__index=0,
index=0
)
except Project.DoesNotExist:
return Response({
'reason': 'Could not find a singular project in the first book of server side'
Expand All @@ -232,7 +246,10 @@ def migrate(self, request, pk):
}, status=status.HTTP_404_NOT_FOUND)

cohort_students = NssUser.objects.filter(
user__is_active=True, user__is_staff=False, assigned_cohorts__cohort=cohort)
user__is_active=True,
user__is_staff=False,
assigned_cohorts__cohort=cohort
)

# Create record in student project
for student in cohort_students:
Expand Down Expand Up @@ -266,6 +283,7 @@ def assign(self, request, pk):
cohort = None
member = None
user_type = request.query_params.get("userType", None)
cohort = Cohort.objects.get(pk=pk)

try:
if user_type is not None and user_type == "instructor":
Expand All @@ -284,7 +302,6 @@ def assign(self, request, pk):
user_id = int(request.data["person_id"])
member = NssUser.objects.get(pk=user_id)

cohort = Cohort.objects.get(pk=pk)
NssUserCohort.objects.get(cohort=cohort, nss_user=member)

return Response(
Expand All @@ -299,10 +316,12 @@ def assign(self, request, pk):
relationship.save()

if user_type is None:
# Assign student to first project in cohort's course
cohort_first_course = cohort.courses.get(index=0)
course_first_book = cohort_first_course.course.books.get(index=0)
book_first_project = course_first_book.projects.get(index=0)
# Assign student to first project in cohort's active course
book_first_project = Project.objects.get(
index=0,
book__course=cohort.courses.get(active=True).course,
book__index=0
)

student_project = StudentProject()
student_project.student = member
Expand Down Expand Up @@ -343,12 +362,21 @@ def assign(self, request, pk):
return Response({'message': ex.args[0]}, status=status.HTTP_404_NOT_FOUND)

except NssUserCohort.DoesNotExist as ex:
return Response({'message': "Student is not assigned to that cohort."}, status=status.HTTP_400_BAD_REQUEST)
return Response(
{'message': "Student is not assigned to that cohort."},
status=status.HTTP_400_BAD_REQUEST
)

except Exception as ex:
return Response({'message': ex.args[0]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
return Response(
{'message': ex.args[0]},
status=status.HTTP_500_INTERNAL_SERVER_ERROR
)

return Response({'message': 'Unsupported HTTP method'}, status=status.HTTP_405_METHOD_NOT_ALLOWED)
return Response(
{'message': 'Unsupported HTTP method'},
status=status.HTTP_405_METHOD_NOT_ALLOWED
)

class MiniCohortSerializer(serializers.ModelSerializer):
"""JSON serializer"""
Expand Down Expand Up @@ -376,13 +404,13 @@ class CohortSerializer(serializers.ModelSerializer):
def get_student_organization_url(self, obj):
try:
return obj.info.student_organization_url
except Exception as ex:
except Exception:
return ""

def get_github_classroom_url(self, obj):
try:
return obj.info.github_classroom_url
except Exception as ex:
except Exception:
return ""

def get_attendance_sheet_url(self, obj):
Expand Down
1 change: 1 addition & 0 deletions LearningAPI/views/student_view.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ def destroy(self, request, pk=None):
StudentTag.objects.filter(student=student).delete()

# Delete all learning records
LearningRecordEntry.objects.filter(record__student=student).delete()
LearningRecord.objects.filter(student=student).delete()

# Delete all core skill records
Expand Down

0 comments on commit 1625598

Please sign in to comment.