[FIX] Fix the filtered_programs_for_user call

app.py

@@ -954,7 +954,7 @@ def programs_page(user):
     filter = request.args.get('filter', default=None, type=str)
     submitted = True if filter == 'submitted' else None
 
-    result = DATABASE.filtered_programs_for_user({"username": from_user or username},
+    result = DATABASE.filtered_programs_for_user(from_user or username,
                                                  level=level,
                                                  adventure=adventure,
                                                  submitted=submitted,
@@ -1756,7 +1756,7 @@ def reset_page():
 @requires_login_redirect
 def profile_page(user):
     profile = DATABASE.user_by_username(user['username'])
-    programs = DATABASE.filtered_programs_for_user({"username": user['username'], "public": 1})
+    programs = DATABASE.filtered_programs_for_user(user['username'], public=True)
     public_profile_settings = DATABASE.get_public_profile_settings(current_user()['username'])
 
     classes = []
@@ -2371,7 +2371,8 @@ def public_user_page(username):
     user_public_info = DATABASE.get_public_profile_settings(username)
     page = request.args.get('page', default=None, type=str)
     if user_public_info:
-        user_programs = DATABASE.filtered_programs_for_user({"username": user['username'], "public": 1},
+        user_programs = DATABASE.filtered_programs_for_user(username,
+                                                            public=True,
                                                             limit=10,
                                                             pagination_token=page)
         next_page_token = user_programs.next_page_token

website/database.py

@@ -198,14 +198,15 @@ def programs_for_user(self, username):
         """
         return PROGRAMS.get_many({"username": username}, reverse=True)
 
-    def filtered_programs_for_user(self, program_query, level=None, adventure=None, submitted=None,
-                                   limit=None, pagination_token=None, public=None):
+    def filtered_programs_for_user(self, username, level=None, adventure=None, submitted=None, public=None,
+                                   limit=None, pagination_token=None):
         ret = []
 
         # FIXME: Query by index, the current behavior is slow for many programs
         # (See https://github.com/hedyorg/hedy/issues/4121)
-        programs = dynamo.GetManyIterator(PROGRAMS, program_query,
+        programs = dynamo.GetManyIterator(PROGRAMS, {"username": username},
                                           reverse=True, batch_size=limit, pagination_token=pagination_token)
+
         for program in programs:
             if level and program.get('level') != int(level):
                 continue
@@ -217,6 +218,8 @@ def filtered_programs_for_user(self, program_query, level=None, adventure=None,
             if submitted is not None:
                 if program.get('submitted') != submitted:
                     continue
+            if public is not None and bool(program.get('public')) != public:
+                continue
 
             ret.append(program)
 

website/for_teachers.py

@@ -222,11 +222,12 @@ def public_programs(self, user, class_id, username):
         filter = request.args.get('filter', default=None, type=str)
         submitted = True if filter == 'submitted' else None
 
-        result = self.db.filtered_programs_for_user({"username": from_user, "public": 1},
+        result = self.db.filtered_programs_for_user(from_user,
                                                     level=level,
                                                     adventure=adventure,
                                                     submitted=submitted,
                                                     pagination_token=page,
+                                                    public=True,
                                                     limit=10)
 
         programs = []