Skip to content

Commit 9e31bb0

Browse files
committed
removed talk's feedback updatedSince query param, which is not good compared to ETag
1 parent c03c1c5 commit 9e31bb0

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
lines changed

cloud/functions/src/functions/firestore/firestore-utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export async function getOrganizerSpaceByToken(
5050
return organizerSpace;
5151
}
5252

53-
export async function ensureTalkFeedbackViewerTokenIsValidThenGetFeedbacks(eventId: string, talkId: string, talkViewerToken: string, updatedSince: Date) {
53+
export async function ensureTalkFeedbackViewerTokenIsValidThenGetFeedbacks(eventId: string, talkId: string, talkViewerToken: string) {
5454
const feedbacksRefs = await db.collection(
5555
`events/${eventId}/talks/${talkId}/feedbacks-access/${talkViewerToken}/feedbacks`
5656
).listDocuments()
@@ -63,7 +63,7 @@ export async function ensureTalkFeedbackViewerTokenIsValidThenGetFeedbacks(event
6363
const feedbackSnapshots = await Promise.all(feedbacksRefs.map(ref => ref.get()))
6464
const feedbacks = feedbackSnapshots.map(snap => snap.data() as TalkAttendeeFeedback)
6565

66-
return feedbacks.filter(feedback => Date.parse(feedback.lastUpdatedOn) > updatedSince.getTime());
66+
return feedbacks;
6767
}
6868

6969
export async function eventTalkStatsFor(eventId: string): Promise<TalkStats[]> {

cloud/functions/src/functions/http/event/legacy/deprecatedAttendeesFeedbacks.ts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,10 @@ export async function legacyAttendeesFeedbacks(request: functions.https.Request,
2222
const familyToken = extractSingleQueryParam(request, 'familyToken');
2323
const familyOrganizerSecretToken = extractSingleQueryParam(request, 'familyOrganizerSecretToken');
2424
const eventId = extractSingleQueryParam(request, 'eventId');
25-
let sinceTimestamp = Date.parse(extractSingleQueryParam(request, 'updatedSince') || "");
26-
27-
// TODO: Remove me
28-
if(isNaN(sinceTimestamp)) {
29-
sinceTimestamp = Date.parse("1970-01-01T00:00:00Z")
30-
}
3125

3226
if(!talkIds || !talkIds.length) { return sendResponseMessage(response, 400, `Missing [talkIds] (multi) query parameter !`) }
3327
if(!eventId) { return sendResponseMessage(response, 400, `Missing [eventId] query parameter !`) }
3428
if(!organizerSecretToken && !familyToken && !familyOrganizerSecretToken) { return sendResponseMessage(response, 400, `Missing either [organizerSecretToken] or [familyToken] or [familyOrganizerSecretToken] query parameter !`) }
35-
if(isNaN(sinceTimestamp)) { return sendResponseMessage(response, 400, `Missing valid [updatedSince] query parameter !`) }
3629

3730
const eventDescriptor = await getEventDescriptor(eventId);
3831
if(familyOrganizerSecretToken) {
@@ -54,8 +47,6 @@ export async function legacyAttendeesFeedbacks(request: functions.https.Request,
5447
// return sendResponseMessage(response, 304)
5548
// }
5649

57-
const updatedSince = new Date(sinceTimestamp);
58-
5950
try {
6051
const organizerSpace = await match([organizerSecretToken, familyToken, familyOrganizerSecretToken])
6152
.with([ P.nullish, P.nullish, P.nullish ], async ([_1, _2]) => { throw new Error(`Unexpected state: (undefined,undefined)`); })
@@ -71,7 +62,7 @@ export async function legacyAttendeesFeedbacks(request: functions.https.Request,
7162
.filter(talkFeedbacksViewerToken => talkIds.includes(talkFeedbacksViewerToken.talkId))
7263
.map(async (talkFeedbackViewerToken) => {
7364

74-
const feedbacks = await ensureTalkFeedbackViewerTokenIsValidThenGetFeedbacks(talkFeedbackViewerToken.eventId, talkFeedbackViewerToken.talkId, talkFeedbackViewerToken.secretToken, updatedSince);
65+
const feedbacks = await ensureTalkFeedbackViewerTokenIsValidThenGetFeedbacks(talkFeedbackViewerToken.eventId, talkFeedbackViewerToken.talkId, talkFeedbackViewerToken.secretToken);
7566

7667
// Enriching bingo entries with label
7768
const enrichedFeedbacks = feedbacks.map(feedback => ({

cloud/functions/src/functions/http/event/talkFeedbacks.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ import {ISODatetime} from "../../../../../../shared/type-utils";
1111

1212
export async function eventTalkFeedbacks(response: Response, pathParams: {eventId: string, talkId: string}, queryParams: {token: string, updatedSince?: ISODatetime|undefined }, request: Request, eventDescriptor: ConferenceDescriptor) {
1313

14-
const updatedSince = queryParams.updatedSince || "1970-01-01T00:00:00Z";
15-
const sinceTimestamp = Date.parse(updatedSince);
16-
if(isNaN(sinceTimestamp)) { return sendResponseMessage(response, 400, `Missing valid [updatedSince] query parameter !`) }
17-
1814
const { eventId, talkId } = pathParams
1915

2016
const { cachedHash, updatesDetected } = await checkEventLastUpdate(eventId, [
@@ -34,7 +30,7 @@ export async function eventTalkFeedbacks(response: Response, pathParams: {eventI
3430
.filter(talkFeedbacksViewerToken => talkId === talkFeedbacksViewerToken.talkId)
3531
.map(async (talkFeedbackViewerToken) => {
3632

37-
const feedbacks = await ensureTalkFeedbackViewerTokenIsValidThenGetFeedbacks(talkFeedbackViewerToken.eventId, talkFeedbackViewerToken.talkId, talkFeedbackViewerToken.secretToken, new Date(sinceTimestamp));
33+
const feedbacks = await ensureTalkFeedbackViewerTokenIsValidThenGetFeedbacks(talkFeedbackViewerToken.eventId, talkFeedbackViewerToken.talkId, talkFeedbackViewerToken.secretToken);
3834

3935
// Enriching bingo entries with label
4036
const enrichedFeedbacks = feedbacks.map(feedback => ({

0 commit comments

Comments
 (0)