Skip to content

Commit ce6ca00

Browse files
Tested with Production Database, Fixed tables names in query for message profiles
1 parent d1f0c22 commit ce6ca00

File tree

2 files changed

+56
-41
lines changed

2 files changed

+56
-41
lines changed

Backend/app.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ def post(self, id):
6262
jwt = JWTManager(app)
6363

6464
# MYSQL Production URI
65-
# app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv(
66-
# 'SQLALCHEMY_DATABASE_URI')
65+
app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv(
66+
'SQLALCHEMY_DATABASE_URI')
6767

6868
# MYSQL Local URI
69-
app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv(
70-
'LOCAL_SQLALCHEMY_DATABASE_URI')
69+
# app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv(
70+
# 'LOCAL_SQLALCHEMY_DATABASE_URI')
7171

7272
db = SQLAlchemy(app)
7373

@@ -957,21 +957,21 @@ def get_last_msgs():
957957
ifnull(NewSC.newmsgs, 0) newmsgs,
958958
StudNI.Name,
959959
StudNI.Image_URL
960-
FROM messages AS m1
960+
FROM Messages AS m1
961961
INNER JOIN (
962962
select T1.pid pid,
963963
max(T1.maxMsgID) maxMsgID
964964
from (
965965
select R.RECEIVER_ID pid,
966966
max(R.Message_ID) maxMsgID
967-
from messages AS R
967+
from Messages AS R
968968
where R.SENDER_ID = :id
969969
group by R.RECEIVER_ID
970970
union
971971
distinct
972972
select S.Sender_ID pid,
973973
max(S.Message_ID) maxMsgID
974-
from messages AS S
974+
from Messages AS S
975975
where S.Receiver_ID = :id
976976
group by S.Sender_ID
977977
) AS T1
@@ -980,7 +980,7 @@ def get_last_msgs():
980980
LEFT JOIN (
981981
select Sender_ID,
982982
COUNT(*) newmsgs
983-
from messages as NewM
983+
from Messages as NewM
984984
where NewM.timestamp >= :dt
985985
and NewM.Sender_ID != :id
986986
group by NewM.Sender_ID
@@ -989,7 +989,7 @@ def get_last_msgs():
989989
select Student_ID,
990990
Name,
991991
Image_URL
992-
from student AS Stud
992+
from Student AS Stud
993993
) AS StudNI ON maxTsC.pid = StudNI.Student_ID"""
994994

995995
str_last_date_time = request.json['DateTime']

Frontend/components/Messages.js

Lines changed: 47 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,30 @@ function Messages() {
5252
}
5353
console.log('VPsTime: ', MinlastMessageTimestamp);
5454

55-
let res = null;
56-
while (res === null) {
57-
await axiosInstance
58-
.post('/get_last_msgs_with_count_name_photo', {
59-
//TODO set MinlastMessageTimestamp for DateTime
60-
// DateTime: '2021-10-26 13:10:38',
61-
DateTime: MinlastMessageTimestamp,
62-
})
63-
.then(response => {
64-
res = response.data;
65-
})
66-
.catch(err => {
67-
console.error('MessageProfiles Error : ' + err);
68-
});
69-
await sleep(2000);
70-
}
55+
// let res = null;
56+
// while (res === null) {
57+
// await axiosInstance
58+
// .post('/get_last_msgs_with_count_name_photo', {
59+
// //TODO set MinlastMessageTimestamp for DateTime
60+
// // DateTime: '2021-10-26 13:10:38',
61+
// DateTime: MinlastMessageTimestamp,
62+
// })
63+
// .then(response => {
64+
// res = response.data;
65+
// })
66+
// .catch(err => {
67+
// console.error('MessageProfiles Error : ' + err);
68+
// });
69+
// await sleep(2000);
70+
// }
71+
const response = await axiosInstance.post(
72+
'/get_last_msgs_with_count_name_photo',
73+
{
74+
// DateTime: '2021-10-26 13:10:38',
75+
DateTime: MinlastMessageTimestamp,
76+
},
77+
);
78+
const res = response.data;
7179

7280
// let unreads = {};
7381
// res.map(profile => {
@@ -102,7 +110,7 @@ function Messages() {
102110

103111
// let vProfilesInterval;
104112

105-
React.useEffect(async () => {
113+
React.useEffect(() => {
106114
// setIsLoading(true);
107115

108116
// async function getProfiles() {
@@ -124,7 +132,11 @@ function Messages() {
124132
// getProfiles();
125133

126134
// console.log('Before append: ', allChats);
127-
await getMessageProfiles();
135+
const init = async () => {
136+
await getMessageProfiles();
137+
};
138+
139+
init();
128140

129141
// if (Object.keys(allChats).length === 0) {
130142
// console.log('Stored chats', getData('chats'));
@@ -143,20 +155,23 @@ function Messages() {
143155
}, []);
144156

145157
React.useEffect(() => {
146-
console.log('messages vProfilesInterval', vProfilesInterval);
147-
if (!vProfilesInterval) {
148-
vProfilesInterval = setInterval(async () => {
149-
await getMessageProfiles();
150-
}, 5000);
151-
setVProfilesInterval(vProfilesInterval);
152-
}
153-
// else if (vProfilesInterval._idleTimeout === -1) {
154-
else if (vProfilesInterval._idleTimeout === -1) {
155-
setVProfilesInterval(prevVProfilesInterval => {
156-
clearInterval(prevVProfilesInterval);
157-
return prevVProfilesInterval;
158-
});
159-
}
158+
const init = async () => {
159+
console.log('messages vProfilesInterval', vProfilesInterval);
160+
if (!vProfilesInterval) {
161+
vProfilesInterval = setInterval(async () => {
162+
await getMessageProfiles();
163+
}, 15000);
164+
setVProfilesInterval(vProfilesInterval);
165+
}
166+
// else if (vProfilesInterval._idleTimeout === -1) {
167+
else if (vProfilesInterval._idleTimeout === -1) {
168+
await setVProfilesInterval(prevVProfilesInterval => {
169+
clearInterval(prevVProfilesInterval);
170+
return prevVProfilesInterval;
171+
});
172+
}
173+
};
174+
init();
160175
}, [vProfilesInterval]);
161176

162177
return (

0 commit comments

Comments
 (0)