Implement lending system #3501

Arashfa0301 · 2023-10-04T20:55:30Z

eikhr

We need an image field in lendableObject, and responsibleRole needs to support multiple roles (and should then be called responsibleRoles)

linear · 2023-10-20T10:56:53Z

ABA-613 Lending system

Backup has requested a lending system, as Abakus has a lot of objects that could be lent out to Ababeads if we just had a good system for it. Arrkom also wants this system to make it easier to administrate Soundboks and grill lending.

…mplement-lending-system # Conflicts: # lego/apps/lending/managers.py # lego/apps/lending/models.py # lego/apps/lending/serializers.py # lego/apps/lending/views.py

lego/api/v1.py

lego/apps/lending/fixtures/development_lending_requests.yaml

lego/apps/lending/notifications.py

lego/apps/lending/managers.py

lego/apps/lending/migrations/0005_alter_lendableobject_responsible_roles.py

jonasdeluna · 2024-05-02T09:08:56Z

@eikhr I'll look closer at the comments after the 2 upcoming exams 👍👍

codecov · 2024-05-24T11:07:38Z

Codecov Report

Attention: Patch coverage is 83.94794% with 148 lines in your changes are missing coverage. Please review.

Project coverage is 88.73%. Comparing base (6abb9ef) to head (cd58144).
Report is 97 commits behind head on master.

Files	Patch %	Lines
lego/apps/lending/permissions.py	32.75%	39 Missing ⚠️
lego/apps/lending/serializers.py	57.69%	22 Missing ⚠️
lego/apps/forums/views.py	68.75%	20 Missing ⚠️
lego/apps/lending/managers.py	0.00%	18 Missing ⚠️
lego/apps/lending/views.py	65.21%	16 Missing ⚠️
lego/apps/forums/permissions.py	73.07%	14 Missing ⚠️
lego/apps/lending/notifications.py	0.00%	14 Missing ⚠️
lego/apps/lending/models.py	95.00%	2 Missing ⚠️
lego/apps/lending/validators.py	50.00%	2 Missing ⚠️
lego/apps/joblistings/views.py	85.71%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #3501      +/-   ##
==========================================
+ Coverage   88.20%   88.73%   +0.53%     
==========================================
  Files         666      696      +30     
  Lines       21069    21726     +657     
==========================================
+ Hits        18584    19279     +695     
+ Misses       2485     2447      -38

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

jonasdeluna · 2024-05-24T11:17:46Z

@eikhr I've fixed your comments, notifications still don't work so they are removed for now. Will squash when merged.

eikhr

I think something weird has happened during a rebase maybe? A lot of unrelated changes in the diff

eikhr · 2024-05-24T14:28:42Z

lego/apps/comments/models.py

+    def get_reactions_grouped(self, user):
+        grouped = {}
+        for reaction in self.reactions.all():
+            if reaction.emoji.pk not in grouped:
+                grouped[reaction.emoji.pk] = {
+                    "emoji": reaction.emoji.pk,
+                    "unicode_string": reaction.emoji.unicode_string,
+                    "count": 0,
+                    "has_reacted": False,
+                    "reaction_id": None,
+                }
+
+            grouped[reaction.emoji.pk]["count"] += 1
+
+            if reaction.created_by == user:
+                grouped[reaction.emoji.pk]["has_reacted"] = True
+                grouped[reaction.emoji.pk]["reaction_id"] = reaction.id
+
+        return sorted(grouped.values(), key=lambda kv: kv["count"], reverse=True)


What's going on here? Why is this in this PR?

eikhr · 2024-05-24T14:29:37Z

lego/apps/email/serializers.py

@@ -44,6 +46,33 @@ class Meta:
            "additional_emails",
        )

+    def validate(self, attrs: Any) -> Any:


And this stuff has nothing to do with the lending system

jonasdeluna · 2024-05-24T14:47:18Z

I think something weird has happened during a rebase maybe? A lot of unrelated changes in the diff

Hmm actually I merged instead of rebasing, how can I resolve it now?

eikhr · 2024-05-28T10:14:51Z

I think something weird has happened during a rebase maybe? A lot of unrelated changes in the diff

Hmm actually I merged instead of rebasing, how can I resolve it now?

I don't know, I haven't seen this before.
Maybe a rebase will help?

Arashfa0301 added backend do-not-merge/hold Pull request is on hold (e.g. waiting for something else to be merged), and should not be merged labels Oct 4, 2023

Arashfa0301 assigned Arashfa0301, EliHaugu and jonasdeluna Oct 4, 2023

Implement lending system

d9db172

jonasdeluna force-pushed the implement-lending-system branch from 51b526c to d9db172 Compare October 19, 2023 18:22

Fix location field bug

10278d8

eikhr reviewed Oct 19, 2023

View reviewed changes

eikhr marked this pull request as draft October 20, 2023 10:59

Fix other thing

69ee849

Arashfa0301 force-pushed the implement-lending-system branch from d01e557 to 69ee849 Compare October 23, 2023 14:32

jonasdeluna and others added 10 commits February 1, 2024 21:56

Fix more

79a8620

Change responsible_role to responsible_roles

eb0ce16

Add fixtures

3583477

Fix image field on lending

0934b6f

Update notified users

cd8db09

Fix conflict bug

78dc3a1

Add remove user migration

10db26d

Fix roles and validation for LendingInstance

651e70a

Change to basismodel for lendinginstance

dcf7b07

Rename user to author, add comment to lendinginstance

e549314

jonasdeluna force-pushed the implement-lending-system branch from 37e3a49 to 53ca393 Compare March 12, 2024 17:45

Arashfa0301 and others added 6 commits March 12, 2024 18:51

Implement lending system

2e0dd15

Fix location field bug

e2b7ca0

Fix other thing

f36ffda

Fix more

9bc279b

Change responsible_role to responsible_roles

097aeb4

Add fixtures

235ceea

jonasdeluna and others added 7 commits March 12, 2024 18:51

Fix image field on lending

6ce54ba

Update notified users

264a16b

Fix conflict bug

7b9c0c8

Add remove user migration

024b0ca

Fix roles and validation for LendingInstance

4a62d98

Change to basismodel for lendinginstance

911630e

Rename user to author, add comment to lendinginstance

ab09ba5

jonasdeluna force-pushed the implement-lending-system branch from 53ca393 to e379fb9 Compare March 12, 2024 17:51

Add notification on update of lending instance

0c729d5

jonasdeluna force-pushed the implement-lending-system branch from e379fb9 to 0c729d5 Compare March 12, 2024 18:29

Merge remote-tracking branch 'origin/implement-lending-system' into i…

75848dc

…mplement-lending-system # Conflicts: # lego/apps/lending/managers.py # lego/apps/lending/models.py # lego/apps/lending/serializers.py # lego/apps/lending/views.py

jonasdeluna marked this pull request as ready for review April 23, 2024 17:16

jonasdeluna changed the title ~~Draft: Implement lending system~~ Implement lending system Apr 23, 2024

eikhr reviewed Apr 24, 2024

View reviewed changes

jonasdeluna force-pushed the implement-lending-system branch from 4b3ad08 to 2fa3ee6 Compare May 24, 2024 11:04

Implement lending system

afc32a3

jonasdeluna force-pushed the implement-lending-system branch from 2fa3ee6 to afc32a3 Compare May 24, 2024 11:12

jonasdeluna requested a review from eikhr May 24, 2024 11:16

Remove notifications

cd58144

jonasdeluna force-pushed the implement-lending-system branch from 44e4af1 to cd58144 Compare May 24, 2024 11:22

eikhr requested changes May 24, 2024

View reviewed changes

Bestem0r mentioned this pull request Jul 6, 2024

Lending system frontend webkom/lego-webapp#4219

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement lending system #3501

Implement lending system #3501

Arashfa0301 commented Oct 4, 2023 •

edited by eikhr

Loading

eikhr left a comment •

edited

Loading

linear bot commented Oct 20, 2023

jonasdeluna commented May 2, 2024

codecov bot commented May 24, 2024 •

edited

Loading

jonasdeluna commented May 24, 2024

eikhr left a comment

eikhr May 24, 2024

eikhr May 24, 2024

jonasdeluna commented May 24, 2024

eikhr commented May 28, 2024

Implement lending system #3501

Are you sure you want to change the base?

Implement lending system #3501

Conversation

Arashfa0301 commented Oct 4, 2023 • edited by eikhr Loading

eikhr left a comment • edited Loading

Choose a reason for hiding this comment

linear bot commented Oct 20, 2023

jonasdeluna commented May 2, 2024

codecov bot commented May 24, 2024 • edited Loading

Codecov Report

jonasdeluna commented May 24, 2024

eikhr left a comment

Choose a reason for hiding this comment

eikhr May 24, 2024

Choose a reason for hiding this comment

eikhr May 24, 2024

Choose a reason for hiding this comment

jonasdeluna commented May 24, 2024

eikhr commented May 28, 2024

Arashfa0301 commented Oct 4, 2023 •

edited by eikhr

Loading

eikhr left a comment •

edited

Loading

codecov bot commented May 24, 2024 •

edited

Loading