Merge pull request #62 from EigenExplorer/57-add-error-handling-for-m…

…etricstvlrestakingstrategy 57 add error handling for metricstvlrestakingstrategy
EigenExplorer · May 16, 2024 · ee81102 · ee81102
2 parents 77c991b + bc22dcf
commit ee81102
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/packages/api/src/routes/avs/avsController.ts b/packages/api/src/routes/avs/avsController.ts
@@ -167,7 +167,7 @@ export async function getAVS(req: Request, res: Response) {
 		const { withTvl } = req.query
 
 		const avs = await prisma.avs.findUniqueOrThrow({
-			where: { address, ...getAvsFilterQuery() },
+			where: { address: address.toLowerCase(), ...getAvsFilterQuery() },
 			include: {
 				curatedMetadata: true,
 				operators: {
@@ -241,7 +241,7 @@ export async function getAVSStakers(req: Request, res: Response) {
 		const { skip, take } = queryCheck.data
 
 		const avs = await prisma.avs.findUniqueOrThrow({
-			where: { address, ...getAvsFilterQuery() },
+			where: { address: address.toLowerCase(), ...getAvsFilterQuery() },
 			include: { operators: true }
 		})
 
@@ -314,7 +314,7 @@ export async function getAVSOperators(req: Request, res: Response) {
 		const { skip, take, withTvl } = queryCheck.data
 
 		const avs = await prisma.avs.findUniqueOrThrow({
-			where: { address, ...getAvsFilterQuery() },
+			where: { address: address.toLowerCase(), ...getAvsFilterQuery() },
 			include: {
 				operators: {
 					where: { isActive: true }

diff --git a/packages/api/src/routes/metrics/metricController.ts b/packages/api/src/routes/metrics/metricController.ts
@@ -74,17 +74,25 @@ export async function getTvlRestaking(req: Request, res: Response) {
 export async function getTvlRestakingByStrategy(req: Request, res: Response) {
 	try {
 		const { strategy } = req.params
-		const strategies = Object.keys(getEigenContracts().Strategies)
 
-		if (strategy && strategies.indexOf(strategy) !== -1) {
-			const tvl = await doGetTvlStrategy(
-				getEigenContracts().Strategies[strategy].strategyContract
-			)
+		if (!strategy) {
+			throw new Error('Invalid strategy name.')
+		}
+
+		const strategies = Object.keys(getEigenContracts().Strategies)
+		const foundStrategy = strategies.find(s => s.toLowerCase() === strategy.toLowerCase())
 
-			res.send({
-				tvl
-			})
+		if (!foundStrategy) {
+			throw new Error('Invalid strategy.')
 		}
+
+		const tvl = await doGetTvlStrategy(
+			getEigenContracts().Strategies[foundStrategy].strategyContract
+		)
+
+		res.send({
+			tvl
+		})
 	} catch (error) {
 		handleAndReturnErrorResponse(req, res, error)
 	}

diff --git a/packages/api/src/routes/operators/operatorController.ts b/packages/api/src/routes/operators/operatorController.ts
@@ -85,10 +85,10 @@ export async function getOperator(req: Request, res: Response) {
 	const { withTvl } = result.data
 
 	try {
-		const { id } = req.params
+		const { address } = req.params
 
 		const operator = await prisma.operator.findUniqueOrThrow({
-			where: { address: id },
+			where: { address: address.toLowerCase() },
 			include: {
 				shares: {
 					select: { strategyAddress: true, shares: true }

diff --git a/packages/api/src/routes/operators/operatorRoutes.ts b/packages/api/src/routes/operators/operatorRoutes.ts
@@ -95,6 +95,6 @@ router.get('/', routeCache.cacheSeconds(120), getAllOperators)
  *               type: string
  *               example: 'Operator not found.'
  */
-router.get('/:id', routeCache.cacheSeconds(120), getOperator)
+router.get('/:address', routeCache.cacheSeconds(120), getOperator)
 
 export default router
diff --git a/packages/api/src/routes/stakers/stakerController.ts b/packages/api/src/routes/stakers/stakerController.ts
@@ -62,10 +62,10 @@ export async function getAllStakers(req: Request, res: Response) {
  */
 export async function getStaker(req: Request, res: Response) {
 	try {
-		const { id } = req.params
+		const { address } = req.params
 
 		const staker = await prisma.staker.findUniqueOrThrow({
-			where: { address: id },
+			where: { address: address.toLowerCase() },
 			include: { shares: true }
 		})
 

diff --git a/packages/api/src/routes/stakers/stakerRoutes.ts b/packages/api/src/routes/stakers/stakerRoutes.ts
@@ -5,6 +5,6 @@ const router = express.Router()
 
 router.get('/', getAllStakers)
 
-router.get('/:id', getStaker)
+router.get('/:address', getStaker)
 
 export default router