Release 202506101742

web/prisma/migrations/20250609213656_suggestion_created_notification_type/migration.sql

@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "NotificationType" ADD VALUE 'SUGGESTION_CREATED';

web/prisma/migrations/20250610163329_feedi_optional/migration.sql

@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[feedId]` on the table `User` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "feedId" TEXT;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_feedId_key" ON "User"("feedId");

web/prisma/migrations/20250610171300_required_feed_id/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Made the column `feedId` on table `User` required. This step will fail if there are existing NULL values in that column.
+
+*/
+-- AlterTable
+ALTER TABLE "User" ALTER COLUMN "feedId" SET NOT NULL;

web/prisma/schema.prisma

@@ -135,6 +135,7 @@ enum NotificationType {
   COMMUNITY_NOTE_ADDED
   /// Comment that is not a reply. May include a rating.
   ROOT_COMMENT_CREATED
+  SUGGESTION_CREATED
   SUGGESTION_MESSAGE
   SUGGESTION_STATUS_CHANGE
   // KARMA_UNLOCK // TODO: [KARMA_UNLOCK] Will be added later, when karma unloks are in the database, not in the code.
@@ -497,6 +498,7 @@ model User {
   moderator       Boolean @default(false)
   verifiedLink    String?
   secretTokenHash String  @unique
+  feedId          String  @unique @default(cuid(2))
   /// Computed via trigger. Do not update through prisma.
   totalKarma      Int     @default(0)
 

web/prisma/triggers/02_service_score.sql

@@ -22,7 +22,7 @@ DROP FUNCTION IF EXISTS recalculate_scores_for_attribute();
 CREATE OR REPLACE FUNCTION calculate_privacy_score(service_id INT) 
 RETURNS INT AS $$
 DECLARE
-    privacy_score INT := 50; -- Start from middle value (50)
+    privacy_score INT := 0;
     kyc_factor INT;
     onion_factor INT := 0;
     i2p_factor INT := 0;
@@ -78,7 +78,7 @@ BEGIN
     WHERE sa."serviceId" = service_id AND a."category" = 'PRIVACY';
     
     -- Calculate final privacy score (base 100)
-    privacy_score := privacy_score + kyc_factor + onion_factor + i2p_factor + monero_factor + open_source_factor + p2p_factor + decentralized_factor + attributes_score;
+    privacy_score := 50 + kyc_factor + onion_factor + i2p_factor + monero_factor + open_source_factor + p2p_factor + decentralized_factor + attributes_score;
     
     -- Ensure the score is in reasonable bounds (0-100)
     privacy_score := GREATEST(0, LEAST(100, privacy_score));
@@ -91,9 +91,11 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION calculate_trust_score(service_id INT) 
 RETURNS INT AS $$
 DECLARE
-    trust_score INT := 50; -- Start from middle value (50)
+    trust_score INT := 0;
     verification_factor INT;
     attributes_score INT := 0;
+    recently_listed_factor INT := 0;
+    tos_penalty_factor INT := 0;
 BEGIN
     -- Get verification status factor
     SELECT 
@@ -124,7 +126,7 @@ BEGIN
         AND "verificationStatus" = 'APPROVED'
         AND (NOW() - "listedAt") <= INTERVAL '15 days'
     ) THEN
-        trust_score := trust_score - 10;
+        recently_listed_factor := -10;
         -- Update the isRecentlyListed flag to true
         UPDATE "Service"
         SET "isRecentlyListed" = TRUE
@@ -144,12 +146,12 @@ BEGIN
         AND "tosReviewAt" IS NOT NULL 
         AND "tosReview" IS NULL
     ) THEN
-        trust_score := trust_score - 3;
+        tos_penalty_factor := -3;
     END IF;
     
     -- Calculate final trust score (base 100)
-    trust_score := trust_score + verification_factor + attributes_score;
-    
+    trust_score := 50 + verification_factor + attributes_score + recently_listed_factor + tos_penalty_factor;
+
     -- Ensure the score is in reasonable bounds (0-100)
     trust_score := GREATEST(0, LEAST(100, trust_score));
     

web/prisma/triggers/07_notifications_service_suggestion.sql

@@ -3,7 +3,20 @@ RETURNS TRIGGER AS $$
 DECLARE
   suggestion_status_change "ServiceSuggestionStatusChange";
 BEGIN
-  IF TG_OP = 'INSERT' THEN -- Corresponds to ServiceSuggestionMessage insert
+  IF TG_OP = 'INSERT' AND TG_TABLE_NAME = 'ServiceSuggestion' THEN -- Corresponds to ServiceSuggestion insert
+    -- Notify all admins when a new suggestion is created
+    INSERT INTO "Notification" ("userId", "type", "aboutServiceSuggestionId")
+    SELECT u."id", 'SUGGESTION_CREATED', NEW."id"
+    FROM "User" u
+    WHERE u."admin" = true
+      AND NOT EXISTS (
+        SELECT 1 FROM "Notification" n
+        WHERE n."userId" = u."id"
+          AND n."type" = 'SUGGESTION_CREATED'
+          AND n."aboutServiceSuggestionId" = NEW."id"
+      );
+
+  ELSIF TG_OP = 'INSERT' AND TG_TABLE_NAME = 'ServiceSuggestionMessage' THEN -- Corresponds to ServiceSuggestionMessage insert
     -- Notify suggestion author (if not the sender)
     INSERT INTO "Notification" ("userId", "type", "aboutServiceSuggestionId", "aboutServiceSuggestionMessageId")
     SELECT s."userId", 'SUGGESTION_MESSAGE', NEW."suggestionId", NEW."id"
@@ -55,6 +68,13 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
+-- Trigger for new suggestions
+DROP TRIGGER IF EXISTS service_suggestion_created_notifications_trigger ON "ServiceSuggestion";
+CREATE TRIGGER service_suggestion_created_notifications_trigger
+  AFTER INSERT ON "ServiceSuggestion"
+  FOR EACH ROW
+  EXECUTE FUNCTION trigger_service_suggestion_notifications();
+
 -- Trigger for new messages
 DROP TRIGGER IF EXISTS service_suggestion_message_notifications_trigger ON "ServiceSuggestionMessage";
 CREATE TRIGGER service_suggestion_message_notifications_trigger