ulivargas/classroomio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: feed not sending notification

Browse Source
This commit is contained in:
Rotimi Best
2024-08-11 10:26:04 +01:00
parent 4baaef529c
commit 56911d8ac2
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dashboard/src/lib/utils/services/newsfeed/index.ts
+9 -5
View File
@@ -109,8 +109,12 @@ export async function deleteNewsFeed(feedId: string) {
return response; return response;
} }
export async function getFeedForNotification(feedId: string, authorId: string) { export async function getFeedForNotification(params: {
const { data, error } = await supabase feedId: string;
authorId: string;
supabase: typeof supabase;
}) {
const { data, error } = await params.supabase
.from('course_newsfeed') .from('course_newsfeed')
.select( .select(
` `
@@ -126,7 +130,7 @@ export async function getFeedForNotification(feedId: string, authorId: string) {
) )
` `
) )
.eq('id', feedId) .eq('id', params.feedId)
.limit(1) .limit(1)
.returns< .returns<
{ {
@@ -169,7 +173,7 @@ export async function getFeedForNotification(feedId: string, authorId: string) {
if (!feed) return; if (!feed) return;
return { return {
id: feedId, id: params.feedId,
courseId: feed.course.id, courseId: feed.course.id,
courseTitle: feed.course.title, courseTitle: feed.course.title,
teacherName: feed.author?.profile?.fullname, teacherName: feed.author?.profile?.fullname,
@@ -177,7 +181,7 @@ export async function getFeedForNotification(feedId: string, authorId: string) {
content: feed.content, content: feed.content,
org: feed.course.group?.organization, org: feed.course.group?.organization,
courseMembers: feed.course?.group?.members courseMembers: feed.course?.group?.members
?.filter((member) => member.id !== authorId) ?.filter((member) => member.id !== params.authorId)
?.map((member) => { ?.map((member) => {
return member.profile; return member.profile;
}) })
apps/dashboard/src/routes/api/email/course/newsfeed/+server.ts
+8 -3
View File
@@ -1,12 +1,17 @@
import { json } from '@sveltejs/kit'; import { json } from '@sveltejs/kit';
import { getSupabase } from '$lib/utils/functions/supabase'; import { getServerSupabase } from '$lib/utils/functions/supabase.server';
import { getFeedForNotification } from '$lib/utils/services/newsfeed/index'; import { getFeedForNotification } from '$lib/utils/services/newsfeed/index';
import sendEmail from '$mail/sendEmail'; import sendEmail from '$mail/sendEmail';
const supabase = getSupabase(); const supabase = getServerSupabase();
const sendEmailNotification = async (feedId: string, authorId: string, comment?: string) => { const sendEmailNotification = async (feedId: string, authorId: string, comment?: string) => {
const feed = await getFeedForNotification(feedId, authorId); const feed = await getFeedForNotification({
supabase,
feedId,
authorId
});
console.log({ feed });
if (!feed) return; if (!feed) return;
const postLink = `https://${feed.org.siteName}.classroomio.com/courses/${feed.courseId}?feedId=${feed.id}`; const postLink = `https://${feed.org.siteName}.classroomio.com/courses/${feed.courseId}?feedId=${feed.id}`;