Small fixes

apiserver/apiserver/api/serializers.py

@@ -534,7 +534,7 @@ class UserSerializer(serializers.ModelSerializer):
     training = UserTrainingSerializer(many=True)
     member = MemberSerializer()
     transactions = serializers.SerializerMethodField()
-    interests = serializers.SerializerMethodField()
+    interests = InterestSerializer(many=True)
     door_code = serializers.SerializerMethodField()
     wifi_pass = serializers.SerializerMethodField()
     app_version = serializers.SerializerMethodField()
@@ -565,13 +565,6 @@ class UserSerializer(serializers.ModelSerializer):
         serializer.is_valid()
         return serializer.data
 
-    def get_interests(self, obj):
-        interests = models.Interest.objects.filter(
-            user=obj,
-            satisfied_by__isnull=True
-        )
-        return [x.course.id for x in interests]
-
     def get_door_code(self, obj):
         if not obj.member.paused_date and obj.cards.count():
             return secrets.DOOR_CODE

apiserver/apiserver/api/views.py

@@ -292,7 +292,7 @@ class SessionViewSet(Base, List, Retrieve, Create, Update):
             try:
                 utils_email.send_interest_email(interest)
             except BaseException as e:
-                msg = 'Problem interest email: ' + str(e)
+                msg = 'Problem sending interest email: ' + str(e)
                 logger.exception(msg)
                 alert_tanner(msg)
 

webclient/src/Classes.js

@@ -139,7 +139,7 @@ function NewClassTableCourse(props) {
 
 				{user &&
 					<div className='interest'>
-						{user.interests.includes(course.id) ?
+						{user.interests.filter(x => !x.satisfied_by).map(x => x.course).includes(course.id) ?
 							'Interested ✅'
 						:
 							<Button

webclient/src/Courses.js

@@ -111,7 +111,9 @@ export function Courses(props) {
 										<Link to={'/courses/'+x.id}>{x.name}</Link>
 									</Table.Cell>
 									<Table.Cell>
-										{x.num_interested}
+										{!!x.num_interested &&
+											<>{x.num_interested} member{x.num_interested !== 1 && 's'}</>
+										}
 									</Table.Cell>
 									<Table.Cell>
 										{!!x.tags && x.tags.split(',').map(name =>