feat: remove/replace references to planter entities

cypress/tests/integration/nockRoutes.js

@@ -1,6 +1,5 @@
 import grower100 from '../../../doc/examples/growers/100.json';
 import organization1 from '../../../doc/examples/organizations/1.json';
-import planter940 from '../../../doc/examples/planters/940.json';
 import { defaultConfig } from '../../../src/context/configContext';
 import capture1 from '../../fixtures/capture.json';
 import leader from '../../fixtures/countries/leader.json';
@@ -10,31 +9,21 @@ export function getNockRoutes(
   props = {
     tree: {},
     organization: {},
-    planter: {},
     grower: {},
     capture: {},
   },
 ) {
   const organization = { ...organization1, ...props.organization };
-  const planter = { ...planter940, ...props.planter };
   const grower = { ...grower100, ...props.grower };
   const tree = { ...tree186734, ...props.tree };
   const capture = { ...capture1, ...props.capture };
   return [
-    {
-      method: 'GET',
-      path: `/planters/${planter.id}`,
-      statusCode: 200,
-      body: planter,
-    },
-
     {
       method: 'GET',
       path: `/growers/${grower.id}`,
       statusCode: 200,
       body: grower,
     },
-
     {
       method: 'GET',
       path: '/trees/featured',
@@ -43,58 +32,24 @@ export function getNockRoutes(
         trees: [tree],
       },
     },
-
     {
       method: 'GET',
       path: `/trees/${tree.id}`,
       statusCode: 200,
       body: tree,
     },
-
-    {
-      method: 'GET',
-      path: `/planters/${planter.planter_id}`,
-      statusCode: 200,
-      body: planter,
-    },
-
     {
       method: 'GET',
       path: `/growers/${grower.grower_id}`,
       statusCode: 200,
       body: grower,
     },
-
     {
       method: 'GET',
       path: `/organizations/${organization.id}`,
       statusCode: 200,
       body: organization,
     },
-
-    {
-      method: 'GET',
-      path: planter.links.species,
-      statusCode: 200,
-      body: {
-        species: [tree],
-      },
-    },
-    {
-      method: 'GET',
-      path: planter.links.associated_organizations,
-      statusCode: 200,
-      body: { organizations: [organization] },
-    },
-    {
-      method: 'GET',
-      path: planter.links.featured_trees,
-      statusCode: 200,
-      body: {
-        trees: [tree],
-      },
-    },
-
     {
       method: 'GET',
       path: grower.links.species,
@@ -117,7 +72,6 @@ export function getNockRoutes(
         trees: [tree],
       },
     },
-
     {
       method: 'GET',
       path: organization.links.species,
@@ -126,12 +80,6 @@ export function getNockRoutes(
         species: [tree],
       },
     },
-    {
-      method: 'GET',
-      path: organization.links.associated_planters,
-      statusCode: 200,
-      body: { planters: [planter] },
-    },
     {
       method: 'GET',
       path: organization.links.associated_growers,

src/mocks/handlers.js

@@ -1,8 +1,8 @@
 import { rest } from 'msw';
 import mockTree from '../../cypress/fixtures/tree186734.json';
 import leader from '../../doc/examples/countries/leader.json';
+import grower from '../../doc/examples/growers/100.json';
 import organization from '../../doc/examples/organizations/1.json';
-import planter from '../../doc/examples/planters/940.json';
 import species from '../../doc/examples/species/1.json';
 
 const trees = { trees: [mockTree, mockTree, mockTree] };
@@ -20,18 +20,20 @@ const handlers = [
   rest.get(`${host}/trees*`, (req, res, ctx) =>
     res(ctx.status(200, 'success'), ctx.json(trees)),
   ),
-  rest.get(`${host}/planters/featured`, (req, res, ctx) =>
+
+  rest.get(`${host}/growers/featured`, (req, res, ctx) =>
     res(
       ctx.status(200, 'success'),
       ctx.json({
-        planters: [planter, planter, planter],
+        growers: [grower, grower, grower],
       }),
     ),
   ),
 
-  rest.get(`${host}/planters/:id`, (req, res, ctx) =>
-    res(ctx.status(200, 'success'), ctx.json(planter)),
+  rest.get(`${host}/growers/:id`, (req, res, ctx) =>
+    res(ctx.status(200, 'success'), ctx.json(grower)),
   ),
+
   rest.get(`${host}/organizations/featured`, (req, res, ctx) =>
     res(
       ctx.status(200, 'success'),
@@ -40,6 +42,7 @@ const handlers = [
       }),
     ),
   ),
+
   rest.get(`${host}/organizations/:id`, (req, res, ctx) =>
     res(ctx.status(200, 'success'), ctx.json(organization)),
   ),
@@ -57,4 +60,5 @@ const handlers = [
     res(ctx.status(200, 'success'), ctx.json(leader)),
   ),
 ];
+
 export default handlers;

src/models/api.js

@@ -101,20 +101,6 @@ export async function getCountryByLatLon(lat, lon) {
   }
 }
 
-export async function getPlanterById(id) {
-  try {
-    const url = apiPaths.planters(id);
-    const begin = Date.now();
-    const res = await axios.get(url);
-    const data = await res.data;
-    log.warn('url:', url, 'took:', Date.now() - begin);
-    return data;
-  } catch (err) {
-    log.error(err.message);
-    throw err;
-  }
-}
-
 export async function getGrowerById(id) {
   try {
     const url = apiPaths.growers(id);

src/models/api.spec.js

@@ -4,11 +4,16 @@ import {
   getFeaturedTrees,
   getOrganizationById,
   getOrgLinks,
-  getPlanterById,
+  getGrowerById,
   getTreeById,
 } from './api';
 import organization from '../../doc/examples/organizations/1.json';
-import mockPlanter from '../../doc/examples/planters/940.json';
+
+it('should get grower by id', async () => {
+  const grower = await getGrowerById(100);
+  expect(grower).toBeDefined();
+  expect(grower.first_name).toBeDefined();
+});
 
 it('should get featured trees', async () => {
   const trees = await getFeaturedTrees();

src/models/utils.js

@@ -198,7 +198,7 @@ const optimizeThemeFonts = (theme) => {
   return temp;
 };
 
-function getPlanterName(firstName, lastName) {
+function getGrowerName(firstName, lastName) {
   return `${firstName} ${(lastName && lastName.slice(0, 1)) || ''}`;
 }
 
@@ -322,7 +322,7 @@ export {
   debounce,
   loadFonts,
   optimizeThemeFonts,
-  getPlanterName,
+  getGrowerName,
   convertFontObjToFontArr,
   nextPathBaseDecode,
   nextPathBaseEncode,

src/pages/growers/[growerid].js

@@ -24,7 +24,7 @@ import Icon from 'components/common/CustomIcon';
 import Info from 'components/common/Info';
 import { useDrawerContext } from 'context/DrawerContext';
 import { useMobile } from 'hooks/globalHooks';
-import planterBackground from 'images/background.png';
+import growerBackground from 'images/background.png';
 import CalendarIcon from 'images/icons/calendar.svg';
 import LocationIcon from 'images/icons/location.svg';
 import PeopleIcon from 'images/icons/people.svg';
@@ -34,7 +34,7 @@ import { useMapContext } from 'mapContext';
 import { getGrowerById, getOrgLinks } from 'models/api';
 import { makeStyles } from 'models/makeStyles';
 import * as pathResolver from 'models/pathResolver';
-import { getLocationString, getPlanterName, wrapper } from 'models/utils';
+import { getLocationString, getGrowerName, wrapper } from 'models/utils';
 
 // make styles for component with material-ui
 const useStyles = makeStyles()((theme) => ({
@@ -86,7 +86,7 @@ export default function Grower(props) {
   // try to find first tree image or default image return
   const backgroundPic =
     grower?.featuredTrees?.trees?.[0]?.image_url ||
-    `${router.basePath}${planterBackground}`;
+    `${router.basePath}${growerBackground}`;
 
   useEffect(() => {
     setTitlesData({
@@ -135,10 +135,7 @@ export default function Grower(props) {
   return (
     <>
       <HeadTag
-        title={`${getPlanterName(
-          grower.first_name,
-          grower.last_name,
-        )} - Grower`}
+        title={`${getGrowerName(grower.first_name, grower.last_name)} - Grower`}
       />
       <Box
         sx={[
@@ -176,10 +173,7 @@ export default function Grower(props) {
                 },
                 {
                   icon: grower.image_url,
-                  name: `${getPlanterName(
-                    grower.first_name,
-                    grower.last_name,
-                  )}`,
+                  name: `${getGrowerName(grower.first_name, grower.last_name)}`,
                 },
               ]}
             />
@@ -228,7 +222,7 @@ export default function Grower(props) {
               }}
             >
               <Typography variant="h2">
-                {getPlanterName(grower.first_name, grower.last_name)}
+                {getGrowerName(grower.first_name, grower.last_name)}
               </Typography>
               <Box sx={{ mt: 2 }}>
                 <Info