Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev server #2177

Merged
merged 7 commits into from
Jul 14, 2024
Merged

Dev server #2177

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bd68101
Merge pull request #2173 from gtech-mulearn/production
jelanmathewjames Jul 13, 2024
f47b273
Merge pull request #2174 from gtech-mulearn/dev-server
jelanmathewjames Jul 13, 2024
1408f4d
Refactor UserLogAPI to filter karma activity log based on launchpad_l…
SharonAliyas5573 Jul 14, 2024
37a7451
Merge branch 'dev' of https://github.com/SharonAliyas5573/mulearnback…
SharonAliyas5573 Jul 14, 2024
1d32237
Merge branch 'gtech-mulearn:dev' into dev
SharonAliyas5573 Jul 14, 2024
e6970ad
Merge pull request #2175 from SharonAliyas5573/dev
jelanmathewjames Jul 14, 2024
00888c6
Merge pull request #2176 from gtech-mulearn/dev
jelanmathewjames Jul 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions api/launchpad/launchpad_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,11 +591,17 @@ def get(self, request, launchpad_id=None):

class UserLogAPI(BaseAPI):
def get(self, request, launchpad_id=None):
launchpad_log = request.query_params.get('launchpad_log', False)
user, response = self.get_authenticated_user(request, launchpad_id)
if response:
return response
karma_activity_log = KarmaActivityLog.objects.filter(user=user.id, appraiser_approved=True).order_by("-created_at")
if not karma_activity_log:

query = Q(user=user.id, appraiser_approved=True)
if launchpad_log:
query &= Q(task__event='launchpad')
karma_activity_log = KarmaActivityLog.objects.filter(query).order_by("-created_at")
if not karma_activity_log.exists():
return CustomResponse(general_message="No karma details available for user").get_success_response()

serializer = UserLogSerializer(karma_activity_log, many=True)
return CustomResponse(response=serializer.data).get_success_response()
Loading