Press n or j to go to the next uncovered block, b, p or k for the previous block.
| 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 | 1x 1x 1x 1x 4x 4x 4x 4x 4x 4x 4x 4x 4x 4x 4x 4x 1x 1x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 1x 3x 3x 3x 3x 3x 3x 3x 3x 3x 3x 3x 3x 2x 1x 1x 3x 3x 3x 1x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 2x 2x 2x 1x 1x 1x 1x 2x 2x 2x 2x 2x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 5x 5x 5x 5x 5x 5x 4x 5x 3x 3x 3x 3x 3x 3x 5x 5x 3x 3x 3x 3x 3x 3x 3x 3x 3x 3x 5x 1x 1x 1x 2x 5x 5x 5x 5x 1x 2x 2x 2x 2x 2x 2x 1x 2x 1x 1x 1x 1x 1x 2x 1x 2x 2x 2x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 3x 3x 3x 3x 3x 3x 3x 3x 1x 1x 2x 2x 2x 2x 2x 3x 3x 3x 3x 3x 3x 2x 2x 2x 2x 2x 2x 2x 3x 2x 3x 3x 3x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x | import { NewsletterGroup, NewsletterSource } from "../types";
import {
handleSupabaseError,
requireAuth,
supabase,
withPerformanceLogging,
} from "./supabaseClient";
const DEFAULT_GROUP_COLOR = "#3b82f6";
const GROUPS_TABLE = 'newsletter_source_groups';
const GROUP_MEMBERS_TABLE = 'newsletter_source_group_members';
/**
* Groups are associated with newsletter_sources. Newsletters inherit group
* membership from their source (newsletter_source_id).
*/
function transformGroup(data: {
id: string;
name: string;
color: string | null;
user_id: string;
created_at: string;
updated_at: string;
sources?: { source: NewsletterSource }[];
}): NewsletterGroup {
return {
id: data.id,
name: data.name,
color: data.color ?? DEFAULT_GROUP_COLOR,
user_id: data.user_id,
created_at: data.created_at,
updated_at: data.updated_at,
sources: data.sources?.map((s) => s.source).filter(Boolean) ?? [],
};
}
export const newsletterGroupApi = {
async getAll(): Promise<NewsletterGroup[]> {
return withPerformanceLogging("newsletterGroups.getAll", async () => {
const user = await requireAuth();
const { data, error } = await supabase
.from(GROUPS_TABLE)
.select(
`
*,
sources:${GROUP_MEMBERS_TABLE}(source:newsletter_sources(*))
`
)
.eq("user_id", user.id)
.order("name", { ascending: true });
if (error) handleSupabaseError(error);
return (data || []).map(transformGroup);
});
},
async getById(id: string): Promise<NewsletterGroup | null> {
return withPerformanceLogging("newsletterGroups.getById", async () => {
const user = await requireAuth();
const { data, error } = await supabase
.from(GROUPS_TABLE)
.select(
`
*,
sources:${GROUP_MEMBERS_TABLE}(source:newsletter_sources(*))
`
)
.eq("id", id)
.eq("user_id", user.id)
.single();
if (error) {
if (error.code === "PGRST116") return null;
handleSupabaseError(error);
}
return data ? transformGroup(data) : null;
});
},
async create(params: {
name: string;
color?: string;
sourceIds?: string[];
}): Promise<NewsletterGroup> {
return withPerformanceLogging("newsletterGroups.create", async () => {
const user = await requireAuth();
const { name, color = DEFAULT_GROUP_COLOR, sourceIds = [] } = params;
const { data: group, error: groupError } = await supabase
.from(GROUPS_TABLE)
.insert({ name, color, user_id: user.id })
.select()
.single();
if (groupError) handleSupabaseError(groupError);
if (sourceIds.length > 0) {
// Validate all sources exist and are owned by the user
const { data: validSources, error: sourcesError } = await supabase
.from('newsletter_sources')
.select('id')
.in('id', sourceIds)
.eq('user_id', user.id);
if (sourcesError) handleSupabaseError(sourcesError);
if (!validSources || validSources.length !== sourceIds.length) {
throw new Error('One or more sources not found or access denied');
}
const { error: membersError } = await supabase
.from(GROUP_MEMBERS_TABLE)
.insert(
sourceIds.map((sourceId) => ({
group_id: group.id,
source_id: sourceId,
user_id: user.id // Explicitly set user_id
}))
);
if (membersError) {
if (membersError.code === '23514' && membersError.message.includes('cannot belong to more than 10')) {
throw new Error('A source cannot belong to more than 10 groups');
}
handleSupabaseError(membersError);
}
}
const created = await this.getById(group.id);
if (!created) throw new Error("Failed to retrieve created group");
return created;
});
},
async update(params: {
id: string;
name?: string;
color?: string;
sourceIds?: string[];
}): Promise<NewsletterGroup> {
return withPerformanceLogging("newsletterGroups.update", async () => {
const user = await requireAuth();
const { id, name, color, sourceIds } = params;
const updates: { name?: string; color?: string } = {};
if (name !== undefined) updates.name = name;
if (color !== undefined) updates.color = color;
if (Object.keys(updates).length > 0) {
// First validate all sources exist and are owned by the user if sourceIds is provided
if (sourceIds && sourceIds.length > 0) {
const { data: validSources, error: sourcesError } = await supabase
.from('newsletter_sources')
.select('id')
.in('id', sourceIds)
.eq('user_id', user.id);
if (sourcesError) handleSupabaseError(sourcesError);
if (!validSources || validSources.length !== sourceIds.length) {
throw new Error('One or more sources not found or access denied');
}
}
const { data: _group, error: groupError } = await supabase
.from(GROUPS_TABLE)
.update({ name, color })
.eq("id", id)
.eq("user_id", user.id)
.select()
.single();
if (groupError) handleSupabaseError(groupError);
// Handle source updates if provided
if (sourceIds) {
// First, get existing sources for the group
const { data: existingSources, error: fetchError } = await supabase
.from(GROUP_MEMBERS_TABLE)
.select("source_id")
.eq("group_id", id);
if (fetchError) handleSupabaseError(fetchError);
const existingSourceIds = existingSources?.map((s) => s.source_id) || [];
const sourcesToAdd = sourceIds.filter((id) => !existingSourceIds.includes(id));
const sourcesToRemove = existingSourceIds.filter((id) => !sourceIds.includes(id));
// Add new sources
if (sourcesToAdd.length > 0) {
const { error: addError } = await supabase
.from(GROUP_MEMBERS_TABLE)
.insert(
sourcesToAdd.map((sourceId) => ({
group_id: id,
source_id: sourceId,
user_id: user.id // Explicitly set user_id
}))
);
if (addError) {
if (addError.code === '23514' && addError.message.includes('cannot belong to more than 10')) {
throw new Error('A source cannot belong to more than 10 groups');
}
handleSupabaseError(addError);
}
}
// Remove old sources
if (sourcesToRemove.length > 0) {
const { error: removeError } = await supabase
.from(GROUP_MEMBERS_TABLE)
.delete()
.eq("group_id", id)
.in("source_id", sourcesToRemove);
if (removeError) handleSupabaseError(removeError);
}
}
}
const updated = await this.getById(id);
if (!updated) throw new Error("Failed to retrieve updated group");
return updated;
});
},
async delete(id: string): Promise<boolean> {
return withPerformanceLogging("newsletterGroups.delete", async () => {
const user = await requireAuth();
const { error } = await supabase
.from(GROUPS_TABLE)
.delete()
.eq("id", id)
.eq("user_id", user.id);
if (error) handleSupabaseError(error);
return true;
});
},
/** Add sources to a group. Validates source ownership via RLS. */
async addSources(params: {
groupId: string;
sourceIds: string[];
}): Promise<NewsletterSource[]> {
return withPerformanceLogging(
"newsletterGroups.addSources",
async () => {
const { groupId, sourceIds } = params;
if (sourceIds.length === 0) return [];
const group = await this.getById(groupId);
if (!group) throw new Error("Group not found");
const user = await requireAuth();
// First validate all sources exist and are owned by the user
const { data: validSources, error: sourcesError } = await supabase
.from('newsletter_sources')
.select('id')
.in('id', sourceIds)
.eq('user_id', user.id);
if (sourcesError) handleSupabaseError(sourcesError);
if (!validSources || validSources.length !== sourceIds.length) {
throw new Error('One or more sources not found or access denied');
}
const { data, error } = await supabase
.from(GROUP_MEMBERS_TABLE)
.insert(
sourceIds.map((sourceId) => ({
group_id: groupId,
source_id: sourceId,
user_id: user.id // Explicitly set user_id
}))
)
.select("source:newsletter_sources(*)");
if (error) {
if (error.code === '23514' && error.message.includes('cannot belong to more than 10')) {
throw new Error('A source cannot belong to more than 10 groups');
}
handleSupabaseError(error);
}
return (
(data as unknown as { source: NewsletterSource }[])?.map((d) => d.source).filter(Boolean) ?? []
);
}
);
},
/** Remove sources from a group. */
async removeSources(params: {
groupId: string;
sourceIds: string[];
}): Promise<boolean> {
return withPerformanceLogging(
"newsletterGroups.removeSources",
async () => {
const { groupId, sourceIds } = params;
if (sourceIds.length === 0) return true;
const group = await this.getById(groupId);
if (!group) throw new Error("Group not found");
const { error } = await supabase
.from(GROUP_MEMBERS_TABLE)
.delete()
.eq("group_id", groupId)
.in("source_id", sourceIds);
if (error) handleSupabaseError(error);
return true;
}
);
},
/** Get all sources in a group. */
async getGroupSources(groupId: string): Promise<NewsletterSource[]> {
return withPerformanceLogging(
"newsletterGroups.getGroupSources",
async () => {
const user = await requireAuth();
const group = await this.getById(groupId);
if (!group) throw new Error("Group not found");
const { data, error } = await supabase
.from(GROUP_MEMBERS_TABLE)
.select("source:newsletter_sources(*)")
.eq("group_id", groupId)
.eq('newsletter_sources.user_id', user.id); // Ensure source ownership
if (error) handleSupabaseError(error);
return (
(data as unknown as { source: NewsletterSource }[])
?.map((d) => d.source)
.filter(Boolean) ?? []
);
}
);
},
/** Get all groups that contain the given source. Newsletters inherit group membership from their source. */
async getSourceGroups(sourceId: string): Promise<NewsletterGroup[]> {
return withPerformanceLogging(
"newsletterGroups.getSourceGroups",
async () => {
const user = await requireAuth();
const { data, error } = await supabase
.from(GROUP_MEMBERS_TABLE)
.select(
`
group:${GROUPS_TABLE}!inner(*)
`
)
.eq("source_id", sourceId)
.eq('group.user_id', user.id); // Ensure group ownership
if (error) handleSupabaseError(error);
type Row = { group: Parameters<typeof transformGroup>[0] | null };
const rows = (data as unknown as Row[]) ?? [];
return rows
.map((d) => d.group)
.filter((g): g is NonNullable<typeof g> => g != null)
.map(transformGroup);
}
);
},
/** Set the groups for a source. Replaces existing memberships. Validates source ownership via RLS. */
async updateSourceGroups(
sourceId: string,
groupIds: string[]
): Promise<NewsletterGroup[]> {
return withPerformanceLogging(
"newsletterGroups.updateSourceGroups",
async () => {
const user = await requireAuth();
if (groupIds.length > 10) {
throw new Error('A source cannot belong to more than 10 groups');
}
const { data: current } = await supabase
.from(GROUP_MEMBERS_TABLE)
.select("group_id, source_id")
.eq("source_id", sourceId);
const currentGroupIds = new Set(
(current || []).map((m: { group_id: string }) => m.group_id)
);
const newGroupIds = new Set(groupIds);
const toAdd = groupIds.filter((gid) => !currentGroupIds.has(gid));
const toRemove = Array.from(currentGroupIds).filter((gid) => !newGroupIds.has(gid));
if (toAdd.length > 0) {
const { error: addErr } = await supabase
.from(GROUP_MEMBERS_TABLE)
.insert(
toAdd.map((group_id) => ({ group_id, source_id: sourceId, user_id: user.id }))
);
if (addErr) handleSupabaseError(addErr);
}
if (toRemove.length > 0) {
const { error: delErr } = await supabase
.from(GROUP_MEMBERS_TABLE)
.delete()
.eq("source_id", sourceId)
.in("group_id", toRemove);
if (delErr) handleSupabaseError(delErr);
}
return this.getSourceGroups(sourceId);
}
);
},
async getStats(): Promise<{
totalGroups: number;
totalSources: number;
averageSourcesPerGroup: number;
groupsWithoutSources: number;
}> {
return withPerformanceLogging("newsletterGroups.getStats", async () => {
const groups = await this.getAll();
const totalSources = groups.reduce(
(sum, g) => sum + (g.sources?.length ?? 0),
0
);
return {
totalGroups: groups.length,
totalSources,
averageSourcesPerGroup:
groups.length > 0 ? totalSources / groups.length : 0,
groupsWithoutSources: groups.filter(
(g) => (g.sources?.length ?? 0) === 0
).length,
};
});
},
async search(query: string): Promise<NewsletterGroup[]> {
return withPerformanceLogging("newsletterGroups.search", async () => {
const user = await requireAuth();
const { data, error } = await supabase
.from(GROUPS_TABLE)
.select(
`
*,
sources:${GROUP_MEMBERS_TABLE}(source:newsletter_sources(*))
`
)
.eq("user_id", user.id)
.ilike("name", `%${query}%`)
.order("name", { ascending: true });
if (error) handleSupabaseError(error);
return (data || []).map(transformGroup);
});
},
};
export const getAllNewsletterGroups = newsletterGroupApi.getAll;
export const getNewsletterGroupById = newsletterGroupApi.getById;
export const createNewsletterGroup = newsletterGroupApi.create;
export const updateNewsletterGroup = newsletterGroupApi.update;
export const deleteNewsletterGroup = newsletterGroupApi.delete;
export const addSourcesToGroup = newsletterGroupApi.addSources;
export const removeSourcesFromGroup = newsletterGroupApi.removeSources;
export const getGroupSources = newsletterGroupApi.getGroupSources;
export const getSourceGroups = newsletterGroupApi.getSourceGroups;
export const updateSourceGroups = newsletterGroupApi.updateSourceGroups;
export const getNewsletterGroupStats = newsletterGroupApi.getStats;
export const searchNewsletterGroups = newsletterGroupApi.search;
export default newsletterGroupApi;
|