Skip to content

Commit

Permalink
Merge pull request #950 from FJNR-inc/develop
Browse files Browse the repository at this point in the history
New feature
  • Loading branch information
RignonNoel authored Mar 24, 2021
2 parents 9f18879 + 3760116 commit 3e363f1
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 3 deletions.
44 changes: 41 additions & 3 deletions retirement/tests/tests_viewset_Retreat.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import json
from datetime import datetime, timedelta
from datetime import (
datetime,
timedelta,
)

import pytz
import responses
Expand All @@ -13,10 +16,19 @@
from rest_framework import status
from rest_framework.test import APIClient

from blitz_api.factories import AdminFactory, UserFactory
from blitz_api.factories import (
AdminFactory,
UserFactory,
)
from blitz_api.models import AcademicLevel
from blitz_api.testing_tools import CustomAPITestCase
from store.models import Membership

from ..models import Retreat, RetreatType, RetreatDate
from retirement.models import (
Retreat,
RetreatType,
RetreatDate,
)

User = get_user_model()

Expand Down Expand Up @@ -186,6 +198,17 @@ def setUp(self):
)
self.retreat_hidden.activate()

self.academic_level = AcademicLevel.objects.create(
name="University"
)
self.membership = Membership.objects.create(
name="basic_membership",
details="1-Year student membership",
price=50,
available=True,
duration=timedelta(days=365),
)

@override_settings(
EXTERNAL_SCHEDULER={
'URL': "http://example.com",
Expand Down Expand Up @@ -462,6 +485,12 @@ def test_create_batch_retreat(self):
'retreat:retreattype-detail',
args=[self.retreatType.id]
),
'exclusive_memberships': [
reverse(
'membership-detail',
args=[self.membership.id]
)
],
'bulk_start_time': '2021-03-01T08:00:00Z',
'bulk_end_time': '2021-03-30T12:00:00Z',
'weekdays': [0, 1, 2]
Expand Down Expand Up @@ -506,6 +535,15 @@ def test_create_batch_retreat(self):

for item in content:
self.assertEqual(item['name'][-2:], 'AM', item)
self.assertEqual(
item['exclusive_memberships'],
[
'http://testserver' + reverse(
'membership-detail',
args=[self.membership.id]
)
],
)
self.check_attributes(item, attributes)

@override_settings(
Expand Down
2 changes: 2 additions & 0 deletions retirement/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ def batch_create(self, request):
validated_data.pop('bulk_start_time')
validated_data.pop('bulk_end_time')
validated_data.pop('weekdays')
memberships = validated_data.pop('exclusive_memberships')

for start, end in zip(retreat_start_dates, retreat_end_dates):
if tz.localize(start).hour < 12:
Expand All @@ -224,6 +225,7 @@ def batch_create(self, request):
"Bloc %d %b"
) + ' ' + suffix
new_retreat = Retreat.objects.create(**validated_data)
new_retreat.exclusive_memberships.set(memberships)
RetreatDate.objects.create(
retreat=new_retreat,
start_time=tz.localize(start),
Expand Down

0 comments on commit 3e363f1

Please sign in to comment.