1616
1717class Retriever :
1818 """Created when retrieving messages"""
19+
1920 @staticmethod
2021 def retrieve_message_list (page , limit , user , ru_id = None , survey = None , cc = None , ce = None , label = None , descend = True ):
2122 """returns list of messages from db"""
22- conditions = []
23- status_conditions = []
2423
2524 if user .is_respondent :
26- status_conditions .append (Status .actor == str (user .user_uuid ))
27- else :
28- status_conditions .append (Status .actor == constants .BRES_USER )
25+ return Retriever ._retrieve_message_list_respondent (page , limit , user = user , ru_id = ru_id , survey = survey ,
26+ cc = cc , ce = ce , label = label , descend = descend )
27+ return Retriever ._retrieve_message_list_internal (page , limit , ru_id = ru_id , survey = survey ,
28+ cc = cc , ce = ce , label = label , descend = descend )
29+
30+ @staticmethod
31+ def _retrieve_message_list_respondent (page , limit , user , ru_id , survey , cc , ce , label , descend ):
32+ """returns list of messages from db"""
33+ conditions = []
34+ status_conditions = [Status .actor == str (user .user_uuid )]
2935
3036 if label is not None :
3137 status_conditions .append (Status .label == str (label ))
@@ -46,38 +52,95 @@ def retrieve_message_list(page, limit, user, ru_id=None, survey=None, cc=None, c
4652
4753 try :
4854 t = db .session .query (SecureMessage .msg_id , func .max (Events .date_time ) # pylint:disable=no-member
49- .label ('max_date' ))\
55+ .label ('max_date' )) \
5056 .join (Events ).join (Status ).outerjoin (Actors ) \
5157 .filter (and_ (* conditions )) \
5258 .filter (and_ (* status_conditions )) \
5359 .filter (or_ (Events .event == EventsApi .SENT .value , Events .event == EventsApi .DRAFT_SAVED .value )) \
5460 .group_by (SecureMessage .msg_id ).subquery ('t' )
5561
5662 if descend :
57- result = SecureMessage .query \
58- .filter (SecureMessage .msg_id == t .c .msg_id ) \
59- .order_by (t .c .max_date .desc ()).paginate (page , limit , False )
60-
63+ order = t .c .max_date .desc ()
6164 else :
62- result = SecureMessage .query \
63- .filter (SecureMessage .msg_id == t .c .msg_id ) \
64- .order_by (t .c .max_date .asc ()).paginate (page , limit , False )
65+ order = t .c .max_date .asc ()
66+
67+ result = SecureMessage .query \
68+ .filter (SecureMessage .msg_id == t .c .msg_id ) \
69+ .order_by (order ).paginate (page , limit , False )
6570
6671 except Exception as e :
6772 logger .error ('Error retrieving messages from database' , error = e )
6873 raise InternalServerError (description = "Error retrieving messages from database" )
6974
7075 return True , result
7176
77+ @staticmethod
78+ def _retrieve_message_list_internal (page , limit , ru_id , survey , cc , ce , label , descend ):
79+ """returns list of messages from db"""
80+ conditions = []
81+ status_reject_conditions = []
82+ valid_statuses = []
83+ actor_conditions = []
84+
85+ if label is not None :
86+ valid_statuses .append (label )
87+ if label in [Labels .INBOX .value , Labels .ARCHIVE .value , Labels .UNREAD .value ]:
88+ actor_conditions .append (Actors .sent_from_internal == False ) # NOQA pylint:disable=singleton-comparison
89+ if label in [Labels .DRAFT .value , Labels .SENT .value ]:
90+ actor_conditions .append (Actors .sent_from_internal == True ) # NOQA pylint:disable=singleton-comparison
91+ else :
92+ status_reject_conditions .append (Labels .DRAFT_INBOX .value )
93+ valid_statuses = [Labels .INBOX .value , Labels .DRAFT .value ]
94+ actor_conditions .append (True )
95+
96+ if ru_id is not None :
97+ conditions .append (SecureMessage .ru_id == str (ru_id ))
98+
99+ if survey is not None :
100+ conditions .append (SecureMessage .survey == str (survey ))
101+
102+ if cc is not None :
103+ conditions .append (SecureMessage .collection_case == str (cc ))
104+
105+ if ce is not None :
106+ conditions .append (SecureMessage .collection_exercise == str (ce ))
107+
108+ try :
109+ t = db .session .query (SecureMessage .msg_id , func .max (Events .date_time ) # pylint:disable=no-member ~ below used to obtain not in
110+ .label ('max_date' )) \
111+ .join (Events ).join (Status ).outerjoin (Actors ) \
112+ .filter (and_ (* conditions )) \
113+ .filter (or_ (* actor_conditions )) \
114+ .filter (~ Status .label .in_ (status_reject_conditions )) \
115+ .filter (Status .label .in_ (valid_statuses )) \
116+ .filter (or_ (Events .event == EventsApi .SENT .value , Events .event == EventsApi .DRAFT_SAVED .value )) \
117+ .group_by (SecureMessage .msg_id ).subquery ('t' )
118+
119+ if descend :
120+ order = t .c .max_date .desc ()
121+ else :
122+ order = t .c .max_date .asc ()
123+
124+ result = SecureMessage .query \
125+ .filter (SecureMessage .msg_id == t .c .msg_id ) \
126+ .order_by (order ).paginate (page , limit , False )
127+
128+ except Exception as e :
129+ logger .exception ('Error retrieving messages from database' , error = e )
130+ raise InternalServerError (description = "Error retrieving messages from database" )
131+
132+ return True , result
133+
72134 @staticmethod
73135 def unread_message_count (user ):
74136 """Count users unread messages"""
75137 status_conditions = []
76138 status_conditions .append (Status .actor == str (user .user_uuid ))
77139 try :
78- result = SecureMessage .query .join (Status ).filter (and_ (* status_conditions )).filter (Status .label == 'UNREAD' ).count ()
140+ result = SecureMessage .query .join (Status ).filter (and_ (* status_conditions )).filter (
141+ Status .label == 'UNREAD' ).count ()
79142 except Exception as e :
80- logger .error ('Error retrieving count of unread messages from database' , error = e )
143+ logger .exception ('Error retrieving count of unread messages from database' , error = e )
81144 raise InternalServerError (description = "Error retrieving count of unread messages from database" )
82145 return result
83146
@@ -86,33 +149,37 @@ def retrieve_thread_list(page, limit, user):
86149 """returns list of threads from db"""
87150 status_conditions = []
88151 conditions = []
152+ actor_conditions = []
89153
90154 if user .is_respondent :
91- status_conditions .append (Status .actor == str (user .user_uuid ))
155+ actor_conditions .append (Status .actor == str (user .user_uuid ))
92156 else :
93- status_conditions .append (Status .actor == constants .BRES_USER )
157+ actor_conditions .append (Status .actor == str (user .user_uuid ))
158+ actor_conditions .append (Status .actor == constants .BRES_USER )
159+ actor_conditions .append (Status .actor == constants .NON_SPECIFIC_INTERNAL_USER )
94160
95161 status_conditions .append (Status .label != Labels .DRAFT_INBOX .value )
96162
97163 try :
98- t = db .session .query (SecureMessage .thread_id , func .max (Events .date_time ) # pylint:disable=no-member
99- .label ('max_date ' )) \
164+ t = db .session .query (SecureMessage .thread_id , func .max (Events .id ) # pylint:disable=no-member
165+ .label ('max_id ' )) \
100166 .join (Events ).join (Status ) \
101167 .filter (and_ (* status_conditions )) \
168+ .filter (or_ (* actor_conditions )) \
102169 .filter (or_ (Events .event == EventsApi .SENT .value , Events .event == EventsApi .DRAFT_SAVED .value )) \
103170 .group_by (SecureMessage .thread_id ).subquery ('t' )
104171
105172 conditions .append (SecureMessage .thread_id == t .c .thread_id )
106- conditions .append (Events .date_time == t .c .max_date )
173+ conditions .append (Events .id == t .c .max_id )
107174
108175 result = SecureMessage .query .join (Events ).join (Status ) \
109176 .filter (or_ (Events .event == EventsApi .SENT .value , Events .event == EventsApi .DRAFT_SAVED .value )) \
110177 .filter (and_ (* conditions )) \
111178 .filter (and_ (* status_conditions )) \
112- .order_by (t .c .max_date .desc ()).paginate (page , limit , False )
179+ .order_by (t .c .max_id .desc ()).paginate (page , limit , False )
113180
114181 except Exception as e :
115- logger .error ('Error retrieving messages from database' , error = e )
182+ logger .exception ('Error retrieving messages from database' , error = e )
116183 raise InternalServerError (description = "Error retrieving messages from database" )
117184
118185 return True , result
@@ -137,11 +204,14 @@ def retrieve_message(message_id, user):
137204 def retrieve_thread (thread_id , user , page , limit ):
138205 """returns paginated list of messages for thread id"""
139206 status_conditions = []
207+ actor_conditions = []
140208
141209 if user .is_respondent :
142- status_conditions .append (Status .actor == str (user .user_uuid ))
210+ actor_conditions .append (Status .actor == str (user .user_uuid ))
143211 else :
144- status_conditions .append (Status .actor == constants .BRES_USER )
212+ actor_conditions .append (Status .actor == str (user .user_uuid ))
213+ actor_conditions .append (Status .actor == constants .BRES_USER )
214+ actor_conditions .append (Status .actor == constants .NON_SPECIFIC_INTERNAL_USER )
145215
146216 status_conditions .append (Status .label != Labels .DRAFT_INBOX .value )
147217
@@ -150,6 +220,7 @@ def retrieve_thread(thread_id, user, page, limit):
150220 result = SecureMessage .query .join (Events ).join (Status ) \
151221 .filter (SecureMessage .thread_id == thread_id ) \
152222 .filter (and_ (* status_conditions )) \
223+ .filter (or_ (* actor_conditions )) \
153224 .filter (or_ (Events .event == EventsApi .SENT .value , Events .event == EventsApi .DRAFT_SAVED .value )) \
154225 .order_by (Events .date_time .desc ()).paginate (page , limit , False )
155226
@@ -168,7 +239,7 @@ def retrieve_draft(message_id, user):
168239 """returns single draft from db"""
169240
170241 try :
171- result = SecureMessage .query .filter (SecureMessage .msg_id == message_id )\
242+ result = SecureMessage .query .filter (SecureMessage .msg_id == message_id ) \
172243 .filter (SecureMessage .statuses .any (Status .label == Labels .DRAFT .value )).first ()
173244 if result is None :
174245 logger .error ('Draft does not exist' , message_id = message_id )
@@ -203,7 +274,7 @@ def check_db_connection():
203274 def check_msg_id_is_a_draft (draft_id , user ):
204275 """Check msg_id is that of a valid draft and return true/false if no ID is present"""
205276 try :
206- result = SecureMessage .query .filter (SecureMessage .msg_id == draft_id )\
277+ result = SecureMessage .query .filter (SecureMessage .msg_id == draft_id ) \
207278 .filter (SecureMessage .statuses .any (Status .label == Labels .DRAFT .value )).first ()
208279 except Exception as e :
209280 logger .error ('Error retrieving message from database' , error = e )
0 commit comments