feat: remove profile restriction table and migrate them to features (#…

…4506)

apps/api/src/db/migrations/20240108060056_remove_profile_restrictions/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the `ProfileRestriction` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropTable
+DROP TABLE "ProfileRestriction";

apps/api/src/db/schema.prisma

@@ -40,17 +40,6 @@ model Preference {
   createdAt                    DateTime @default(now())
 }
 
-model ProfileRestriction {
-  id          String   @id
-  isFlagged   Boolean  @default(false)
-  isSuspended Boolean  @default(false)
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
-
-  // Indexes
-  @@index([isFlagged, isSuspended])
-}
-
 model MembershipNft {
   id                String   @id
   dismissedOrMinted Boolean  @default(false)

apps/api/src/routes/internal/cron/cleanPostgres.ts

@@ -37,11 +37,6 @@ export const post: Handler = async (req, res) => {
   }
 
   try {
-    // Cleanup ProfileRestriction
-    await prisma.profileRestriction.deleteMany({
-      where: { isFlagged: false, isSuspended: false }
-    });
-
     // Cleanup Preference
     await prisma.preference.deleteMany({
       where: { highSignalNotificationFilter: false, isPride: false }

apps/api/src/routes/preferences/get.ts

@@ -19,28 +19,21 @@ export const get: Handler = async (req, res) => {
   }
 
   try {
-    const [
-      preference,
-      pro,
-      features,
-      membershipNft,
-      restriction,
-      trustedProfile
-    ] = await prisma.$transaction([
-      prisma.preference.findUnique({ where: { id: id as string } }),
-      prisma.pro.findFirst({ where: { profileId: id as string } }),
-      prisma.profileFeature.findMany({
-        select: { feature: { select: { key: true } } },
-        where: {
-          enabled: true,
-          feature: { enabled: true },
-          profileId: id as string
-        }
-      }),
-      prisma.membershipNft.findUnique({ where: { id: id as string } }),
-      prisma.profileRestriction.findUnique({ where: { id: id as string } }),
-      prisma.trustedProfile.findUnique({ where: { id: id as string } })
-    ]);
+    const [preference, pro, features, membershipNft, trustedProfile] =
+      await prisma.$transaction([
+        prisma.preference.findUnique({ where: { id: id as string } }),
+        prisma.pro.findFirst({ where: { profileId: id as string } }),
+        prisma.profileFeature.findMany({
+          select: { feature: { select: { key: true } } },
+          where: {
+            enabled: true,
+            feature: { enabled: true },
+            profileId: id as string
+          }
+        }),
+        prisma.membershipNft.findUnique({ where: { id: id as string } }),
+        prisma.trustedProfile.findUnique({ where: { id: id as string } })
+      ]);
 
     const response: Preferences = {
       features: features.map((feature: any) => feature.feature?.key),
@@ -50,10 +43,8 @@ export const get: Handler = async (req, res) => {
       highSignalNotificationFilter: Boolean(
         preference?.highSignalNotificationFilter
       ),
-      isFlagged: Boolean(restriction?.isFlagged),
       isPride: Boolean(preference?.isPride),
       isPro: Boolean(pro),
-      isSuspended: Boolean(restriction?.isSuspended),
       isTrusted: Boolean(trustedProfile)
     };
 

apps/api/tests/preferences/get.spec.ts

@@ -21,7 +21,5 @@ describe('preferences/get', () => {
     expect(response.data.result.isTrusted).toBeTruthy();
     expect(response.data.result.highSignalNotificationFilter).toBeTruthy();
     expect(response.data.result.isPride).toBeTruthy();
-    expect(response.data.result.isFlagged).toBeFalsy();
-    expect(response.data.result.isSuspended).toBeFalsy();
   });
 });

apps/web/src/components/Common/Providers/PreferencesProvider.tsx

@@ -59,8 +59,8 @@ const PreferencesProvider: FC = () => {
 
         // Restriction
         setRestriction({
-          isFlagged: preferences.isFlagged,
-          isSuspended: preferences.isSuspended
+          isFlagged: preferences.features.includes(FeatureFlag.Flagged),
+          isSuspended: preferences.features.includes(FeatureFlag.Suspended)
         });
 
         // Feature flags

apps/web/src/components/Shared/GlobalBanners/Flagged.tsx

@@ -15,8 +15,8 @@ const Flagged: FC = () => {
 
   return (
     <div className="border-b border-red-300 bg-red-500/20">
-      <GridLayout className="!p-5">
-        <GridItemEight className="!mb-0 space-y-1">
+      <GridLayout>
+        <GridItemEight className="space-y-1">
           <div className="flex items-center space-x-2 text-red-700">
             <FlagIcon className="size-5" />
             <div className="text-base font-bold sm:text-lg">

apps/web/src/components/Shared/GlobalBanners/ProtectProfile.tsx

@@ -69,8 +69,8 @@ const ProtectProfile: FC = () => {
 
   return (
     <div className="border-b border-red-300 bg-red-500/20">
-      <GridLayout className="!p-5">
-        <GridItemEight className="!mb-0 space-y-1">
+      <GridLayout>
+        <GridItemEight className="space-y-1">
           <div className="flex items-center space-x-2 text-red-700">
             <LockOpenIcon className="size-5" />
             <div className="text-base font-bold sm:text-lg">

apps/web/src/components/Shared/GlobalBanners/Suspended.tsx

@@ -15,8 +15,8 @@ const Suspended: FC = () => {
 
   return (
     <div className="border-b border-red-300 bg-red-500/20">
-      <GridLayout className="!p-5">
-        <GridItemEight className="!mb-0 space-y-1">
+      <GridLayout>
+        <GridItemEight className="space-y-1">
           <div className="flex items-center space-x-2 text-red-700">
             <NoSymbolIcon className="size-5" />
             <div className="text-base font-bold sm:text-lg">

apps/web/src/components/Staff/Users/Overview/Tool/index.tsx

@@ -27,7 +27,6 @@ import LeafwatchDetails from './LeafwatchDetails';
 import ManagedProfiles from './ManagedProfiles';
 import OnchainIdentities from './OnchainIdentities';
 import Rank from './Rank';
-import Restrictions from './Restrictions';
 
 interface ProfileStaffToolProps {
   profile: Profile;
@@ -161,7 +160,6 @@ const ProfileStaffTool: FC<ProfileStaffToolProps> = ({ profile }) => {
       {preferences ? (
         <>
           <Access preferences={preferences} profileId={profile.id} />
-          <Restrictions preferences={preferences} profileId={profile.id} />
           <div className="divider my-5 border-dashed border-yellow-600" />
           <FeatureFlags
             features={preferences.features || []}

packages/data/feature-flags.ts

@@ -1,7 +1,9 @@
 export enum FeatureFlag {
+  Flagged = 'flagged',
   Gardener = 'gardener',
   GardenerMode = 'gardener-mode',
   LensMember = 'lens-member',
   Staff = 'staff',
-  StaffMode = 'staff-mode'
+  StaffMode = 'staff-mode',
+  Suspended = 'suspended'
 }

packages/lib/api/getPreferences.ts

@@ -25,10 +25,8 @@ const getPreferences = async (
       features: [],
       hasDismissedOrMintedMembershipNft: false,
       highSignalNotificationFilter: false,
-      isFlagged: false,
       isPride: false,
       isPro: false,
-      isSuspended: false,
       isTrusted: false
     };
   }

packages/types/hey.d.ts

@@ -86,9 +86,7 @@ export type Preferences = {
   features: string[];
   hasDismissedOrMintedMembershipNft: boolean;
   highSignalNotificationFilter: boolean;
-  isFlagged: boolean;
   isPride: boolean;
   isPro: boolean;
-  isSuspended: boolean;
   isTrusted: boolean;
 };