Skip to content

Commit 27522b6

Browse files
author
Hieu Lam - TMA
authored
fix-7781: favourite_sessions Docs not included in api_blueprint_source (#9056)
* fix-7781: favourite_sessions Docs not included in api_blueprint_source * fix-7781: favourite_sessions Docs not included in api_blueprint_source * fix-7781: favourite_sessions Docs not included in api_blueprint_source * fix-7781: favourite_sessions Docs not included in api_blueprint_source * fix-7781: favourite_sessions Docs not included in api_blueprint_source * fix-7781: favourite_sessions Docs not included in api_blueprint_source * fix-7781: favourite_sessions Docs not included in api_blueprint_source * fix-7781: favourite_sessions Docs not included in api_blueprint_source * fix-7781: favourite_sessions Docs not included in api_blueprint_source * fix-7781: favourite_sessions Docs not included in api_blueprint_source * fix-7781: favourite_sessions Docs not included in api_blueprint_source * fix-7781: favourite_sessions Docs not included in api_blueprint_source * fix-7781: favourite_sessions Docs not included in api_blueprint_source
1 parent 2766736 commit 27522b6

File tree

4 files changed

+43
-23
lines changed

4 files changed

+43
-23
lines changed

‎docs/api/api_blueprint_source.apib‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ The Open Event API Server
129129

130130
<!-- include(blueprint/event/favourite_events.apib) -->
131131

132+
<!-- include(blueprint/session/favourite_sessions.apib) -->
133+
132134
<!-- include(blueprint/import_jobs.apib) -->
133135

134136
<!-- include(blueprint/video_stream.apib) -->

‎docs/api/blueprint/session/favourite_sessions.apib‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ This Group's APIs can be used for adding a particular session to the favourite l
4848
}
4949
}
5050
},
51-
"attributes": {
52-
"deleted-at": null
53-
},
5451
"id": "1",
5552
"links": {
5653
"self": "/v1/user-favourite-sessions/1"
@@ -63,8 +60,9 @@ This Group's APIs can be used for adding a particular session to the favourite l
6360
"version": "1.0"
6461
}
6562
}
63+
6664

67-
## Favourite Sessions Collection List [/v1/user/1/favourite-sessions]
65+
## Favourite Sessions Collection List [/v1/users/1/user-favourite-sessions]
6866

6967
### List All Favourite Sessions of an User [GET]
7068

@@ -95,9 +93,6 @@ This Group's APIs can be used for adding a particular session to the favourite l
9593
}
9694
}
9795
},
98-
"attributes": {
99-
"deleted-at": null
100-
},
10196
"links": {
10297
"self": "/v1/user-favourite-sessions/1"
10398
}
@@ -114,7 +109,7 @@ This Group's APIs can be used for adding a particular session to the favourite l
114109
}
115110
}
116111

117-
## Favourite Sessions Collection List [/v1/session/1/favourite-sessions]
112+
## Favourite Sessions Collection List [/v1/sessions/1/user-favourite-sessions]
118113

119114
### List All Favourite Sessions of a Session [GET]
120115

@@ -145,9 +140,6 @@ This Group's APIs can be used for adding a particular session to the favourite l
145140
}
146141
}
147142
},
148-
"attributes": {
149-
"deleted-at": null
150-
},
151143
"links": {
152144
"self": "/v1/user-favourite-sessions/1"
153145
}
@@ -164,7 +156,7 @@ This Group's APIs can be used for adding a particular session to the favourite l
164156
}
165157
}
166158

167-
## Favourite Sessions Collection List [/v1/event/1/favourite-sessions]
159+
## Favourite Sessions Collection List [/v1/events/1/user-favourite-sessions]
168160

169161
### List All Favourite Sessions of an Event [GET]
170162

@@ -195,9 +187,6 @@ This Group's APIs can be used for adding a particular session to the favourite l
195187
}
196188
}
197189
},
198-
"attributes": {
199-
"deleted-at": null
200-
},
201190
"links": {
202191
"self": "/v1/user-favourite-sessions/1"
203192
}
@@ -241,9 +230,6 @@ This Group's APIs can be used for adding a particular session to the favourite l
241230
"self": "/v1/user-favourite-sessions/1"
242231
},
243232
"id": "1",
244-
"attributes": {
245-
"deleted-at": null
246-
},
247233
"relationships": {
248234
"user": {
249235
"links": {

‎tests/factories/user_favourite_sessions.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
from app.models.user import User
44
from app.models.user_favourite_session import UserFavouriteSession
55
from tests.factories.base import BaseFactory
6-
from tests.factories.session import SessionFactoryBasic
6+
from tests.factories.session import SessionFactory
77

88

99
class UserFavouriteSessionFactory(BaseFactory):
1010
class Meta:
1111
model = UserFavouriteSession
1212

1313
user = factory.LazyAttribute(lambda a: User.query.first())
14-
session = factory.SubFactory(SessionFactoryBasic)
14+
session = factory.SubFactory(SessionFactory)

‎tests/hook_main.py‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
from tests.factories.tax import TaxFactory
5353
from tests.factories.station import StationFactory, StationSubFactory
5454
from tests.factories.station_store_pax import StationStorePaxFactory
55-
from tests.factories.session import SessionFactory, SessionFactoryBasic, SessionSubFactory
55+
from tests.factories.session import SessionFactory, SessionSubFactory
5656
from tests.factories.speaker import SpeakerFactory
5757
from tests.factories.ticket import TicketFactory, TicketSubFactory
5858
from tests.factories.attendee import (
@@ -61,7 +61,7 @@
6161
AttendeeSubFactory,
6262
)
6363
from tests.factories.session_type import SessionTypeFactory
64-
from tests.factories.track import TrackFactory
64+
from tests.factories.track import TrackFactory, TrackFactoryBase
6565
from tests.factories.ticket_tag import TicketTagFactory
6666
from tests.factories.role import RoleFactory
6767
from tests.factories.ticket_fee import TicketFeesFactory
@@ -4829,7 +4829,9 @@ def favourite_sessions_list_post(transaction):
48294829
:return:
48304830
"""
48314831
with stash['app'].app_context():
4832-
session = SessionFactoryBasic()
4832+
event = EventFactoryBasic()
4833+
track = TrackFactoryBase()
4834+
session = SessionSubFactory(event=event, track=track)
48334835
db.session.add(session)
48344836
db.session.commit()
48354837

@@ -4860,6 +4862,36 @@ def favourite_session_delete(transaction):
48604862
db.session.commit()
48614863

48624864

4865+
@hooks.before(
4866+
"Favourite Sessions > Favourite Sessions Collection List > List All Favourite Sessions of a Session"
4867+
)
4868+
def favourite_sessions_list_get_under_session(transaction):
4869+
"""
4870+
GET /v1/sessions/1/user-favourite-sessions
4871+
:param transaction:
4872+
:return:
4873+
"""
4874+
with stash['app'].app_context():
4875+
user_fav_session = UserFavouriteSessionFactory()
4876+
db.session.add(user_fav_session)
4877+
db.session.commit()
4878+
4879+
4880+
@hooks.before(
4881+
"Favourite Sessions > Favourite Sessions Collection List > List All Favourite Sessions of an Event"
4882+
)
4883+
def favourite_sessions_list_get_under_event(transaction):
4884+
"""
4885+
GET /v1/sessions/1/user-favourite-sessions
4886+
:param transaction:
4887+
:return:
4888+
"""
4889+
with stash['app'].app_context():
4890+
user_fav_session = UserFavouriteSessionFactory()
4891+
db.session.add(user_fav_session)
4892+
db.session.commit()
4893+
4894+
48634895
# ------------------------- Admin Statistics -------------------------
48644896

48654897

0 commit comments

Comments
 (0)