kennethscoffee/starr-philproperties
1
0
Fork 0
mirror of https://github.com/rgrgogu/new_starr.git synced 2026-09-27 00:12:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

revise ads and alerts

Browse Source
This commit is contained in:
kennethobsequio
2026-08-03 22:48:06 +08:00
parent 32c72f0b39
commit 573cfb98af
16 changed files with 414 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/notificationBroadcasts.controller.js
+24 -7
View File
@@ -66,7 +66,7 @@ async function countActiveSticky(excludeId = null) {
});
}
const MAX_ACTIVE_STICKY = 3;
const MAX_ACTIVE_STICKY = 2;
const ACTIVE_STICKY_CAP_MESSAGE = `Maximum of ${MAX_ACTIVE_STICKY} active sticky alerts right now — this stays in Draft until one ends or is archived.`;
async function validateImageAssetId(image_asset_id) {
@@ -97,7 +97,7 @@ async function propagateNotificationVisibility(where, { show_in_sticky, show_in_
async function applyBroadcastFields(broadcast, body) {
if (body.title !== undefined) broadcast.title = body.title;
if (body.message !== undefined) broadcast.message = body.message;
if (body.message !== undefined) broadcast.message = body.message || null;
if (body.link_url !== undefined) broadcast.link_url = body.link_url?.trim() || null;
if (body.link_label !== undefined) broadcast.link_label = body.link_label?.trim() || null;
if (body.color !== undefined) broadcast.color = body.color || 'indigo';
@@ -254,7 +254,6 @@ exports.createBroadcast = async (req, res) => {
} = req.body;
if (!title) return R.error(res, "title is required.", 400);
if (!message) return R.error(res, "message is required.", 400);
if (!target_type) return R.error(res, "target_type is required.", 400);
if (!ALLOWED_TARGET_TYPES.includes(target_type)) return R.error(res, `Invalid target_type. Must be one of: ${ALLOWED_TARGET_TYPES.join(", ")}`, 400);
if (SCOPED_TARGET_TYPES.includes(target_type) && !target_id) return R.error(res, "target_id is required for this target_type.", 400);
@@ -265,6 +264,12 @@ exports.createBroadcast = async (req, res) => {
if (!showSticky && !showNotifs) {
return R.error(res, "At least one of show_in_sticky or show_in_notifications must be enabled.", 400);
}
if (showSticky && showNotifs) {
return R.error(res, "Choose only one: Sticky or Notifications.", 400);
}
if (showNotifs && !message) {
return R.error(res, "message is required for Notifications alerts.", 400);
}
if (start_date && end_date && new Date(start_date) > new Date(end_date)) {
return R.error(res, "Start date must be before end date.", 400);
@@ -278,7 +283,7 @@ exports.createBroadcast = async (req, res) => {
try {
const broadcast = await NotificationBroadcast.build({
title,
message,
message: message || null,
link_url: link_url?.trim() || null,
link_label: link_label?.trim() || null,
color: color || 'indigo',
@@ -328,6 +333,16 @@ exports.updateBroadcast = async (req, res) => {
err.status = 400;
throw err;
}
if (broadcast.show_in_sticky && broadcast.show_in_notifications) {
const err = new Error("Choose only one: Sticky or Notifications.");
err.status = 400;
throw err;
}
if (broadcast.show_in_notifications && !broadcast.message) {
const err = new Error("message is required for Notifications alerts.");
err.status = 400;
throw err;
}
// Editing a live broadcast to newly flip on show_in_sticky is the same
// "activate a sticky slot" action as sendBroadcast — must respect the
@@ -352,7 +367,9 @@ exports.updateBroadcast = async (req, res) => {
if (broadcast.status === 'sent') {
const propagated = {
title: broadcast.title,
message: broadcast.message,
// admin_notifications/user_notifications.message stays NOT NULL —
// sticky-mode broadcasts have a null message here, so fall back to "".
message: broadcast.message || "",
color: broadcast.color,
image_asset_id: broadcast.image_asset_id,
show_in_sticky: broadcast.show_in_sticky,
@@ -419,7 +436,7 @@ exports.sendBroadcast = async (req, res) => {
const baseNotify = NOTIFICATION_REGISTRY.broadcast.build({
title: broadcast.title,
message: broadcast.message,
message: broadcast.message || "",
targetType,
targetId,
linkUrl: broadcast.link_url,
@@ -458,7 +475,7 @@ exports.sendBroadcast = async (req, res) => {
user_id,
...(targetType === 'task_list'
? NOTIFICATION_REGISTRY.broadcast.build({
title: broadcast.title, message: broadcast.message, targetType, targetId,
title: broadcast.title, message: broadcast.message || "", targetType, targetId,
groupId: groupByUser[user_id] ?? null,
linkUrl: broadcast.link_url,
linkLabel: broadcast.link_label,