Merge pull request #2166 from Plant-for-the-Planet-org/feature/remove…

…-treecounter-references-in-apis

Remove references to treecounter/treecounter groups from profile apis

prisma/schema.prisma

@@ -61,7 +61,6 @@ model project {
 
 model profile {
     id           	Int            @id @default(autoincrement())
-		treecounterId Int						 @map("treecounter_id")
     guid         	String         @db.VarChar(32)
     name         	String?        @db.VarChar(255)
 		deleted_at		DateTime?      @map("deleted_at") @db.DateTime(0)

src/features/common/Layout/MyForestContextV2.tsx

@@ -81,7 +81,6 @@ export const MyForestProviderV2: FC = ({ children }) => {
   const _contributions = trpc.myForestV2.contributions.useQuery(
     {
       profileId: `${userInfo?.profileId}`,
-      slug: `${userInfo?.slug}`,
     },
     {
       enabled: !!userInfo?.profileId && !!userInfo?.slug,
@@ -93,7 +92,6 @@ export const MyForestProviderV2: FC = ({ children }) => {
   const _leaderboard = trpc.myForestV2.leaderboard.useQuery(
     {
       profileId: `${userInfo?.profileId}`,
-      slug: `${userInfo?.slug}`,
     },
     {
       enabled: !!userInfo?.profileId && !!userInfo?.slug,

src/features/common/types/myForestv2.d.ts

@@ -113,7 +113,7 @@ export type MyForestProject = Omit<ProjectQueryResult, 'allowDonations'> & {
   allowDonations: boolean;
 };
 
-export type GroupTreecounterQueryResult = {
+export type ProfileGroupQueryResult = {
   profileId: number;
 };
 

src/server/procedures/myForestV2/contributions.ts

@@ -18,7 +18,7 @@ import {
 } from '../../../features/common/types/myForestv2';
 import getPointCoordinates from '../../../utils/getPointCoordinates';
 import { fetchProfile } from '../../utils/fetchProfile';
-import { fetchGroupTreecounterData } from '../../utils/fetchGroupTreecounterData';
+import { fetchProfileGroupData } from '../../utils/fetchProfileGroupData';
 
 function initializeStats(): ContributionStats {
   return {
@@ -379,10 +379,9 @@ export const contributionsProcedure = procedure
   .input(
     z.object({
       profileId: z.string(),
-      slug: z.string(),
     })
   )
-  .query(async ({ input: { profileId, slug } }) => {
+  .query(async ({ input: { profileId } }) => {
     console.log(new Date().toLocaleString(), 'starting contributionsProcedure');
 
     // Initialize return values
@@ -406,15 +405,11 @@ export const contributionsProcedure = procedure
       });
     }
 
-    // Check if the profile is associated with a group treecounter, and fetch all profile ids for that group (parent and children)
-    // slug and treecounterId are used to identify the group treecounter, if there is a mismatch, it will be treated as a normal profile
-    const groupTreecounterData = await fetchGroupTreecounterData(
-      slug,
-      profile.treecounterId
-    );
+    // Check if the profile is associated with a profile group, and fetch all profile ids for that group (parent and children)
+    const profileGroupData = await fetchProfileGroupData(profile.id);
     const profileIds =
-      groupTreecounterData.length > 0
-        ? groupTreecounterData.map(({ profileId }) => profileId)
+      profileGroupData.length > 0
+        ? profileGroupData.map(({ profileId }) => profileId)
         : [profile.id];
 
     // Fetch eligible projects

src/server/procedures/myForestV2/leaderboard.ts

@@ -5,7 +5,7 @@ import prisma from '../../../../prisma/client';
 import { TRPCError } from '@trpc/server';
 import { Prisma } from '@prisma/client';
 import { fetchProfile } from '../../utils/fetchProfile';
-import { fetchGroupTreecounterData } from '../../utils/fetchGroupTreecounterData';
+import { fetchProfileGroupData } from '../../utils/fetchProfileGroupData';
 
 async function fetchMostRecentGifts(profileIds: number[]) {
   return await prisma.$queryRaw<
@@ -58,10 +58,9 @@ export const leaderboardProcedure = procedure
   .input(
     z.object({
       profileId: z.string(),
-      slug: z.string(),
     })
   )
-  .query(async ({ input: { profileId, slug } }) => {
+  .query(async ({ input: { profileId } }) => {
     // Initialize return values
     const leaderboard: Leaderboard = {
       mostRecent: [],
@@ -78,15 +77,11 @@ export const leaderboardProcedure = procedure
       });
     }
 
-    // Check if the profile is associated with a group treecounter, and fetch all profile ids for that group (parent and children)
-    // slug and treecounterId are used to identify the group treecounter, if there is a mismatch, it will be treated as a normal profile
-    const groupTreecounterData = await fetchGroupTreecounterData(
-      slug,
-      profile.treecounterId
-    );
+    // Check if the profile is associated with a profile group, and fetch all profile ids for that group (parent and children)
+    const profileGroupData = await fetchProfileGroupData(profile.id);
     const profileIds =
-      groupTreecounterData.length > 0
-        ? groupTreecounterData.map(({ profileId }) => profileId)
+      profileGroupData.length > 0
+        ? profileGroupData.map(({ profileId }) => profileId)
         : [profile.id];
 
     // Fetch the most recent gifts for the profile(s)

src/server/utils/fetchProfile.ts

@@ -5,7 +5,6 @@ export async function fetchProfile(profileId: string) {
     select: {
       id: true,
       guid: true,
-      treecounterId: true,
     },
     where: {
       guid: profileId,

src/server/utils/fetchProfileGroupData.ts

@@ -0,0 +1,25 @@
+import prisma from '../../../prisma/client';
+import { ProfileGroupQueryResult } from '../../features/common/types/myForestv2';
+
+export async function fetchProfileGroupData(profileId: number) {
+  const data = await prisma.$queryRaw<ProfileGroupQueryResult[]>`
+				SELECT pg.profile_id as profileId
+				FROM profile_group AS pg
+				WHERE pg.lft BETWEEN (
+						SELECT root.lft
+						FROM profile_group AS root
+						WHERE root.profile_id = ${profileId}
+				) AND (
+						SELECT root.rgt
+						FROM profile_group AS root
+						WHERE root.profile_id = ${profileId}
+				)
+				AND pg.root_id = (
+						SELECT root.root_id
+						FROM profile_group AS root
+						WHERE root.profile_id = ${profileId}
+				)
+				AND pg.profile_id IS NOT NULL;
+			`;
+  return data;
+}