From 5d3d09923f405bf53c6384a4487fee9195c3118f Mon Sep 17 00:00:00 2001 From: Laurence Isla Date: Tue, 21 May 2024 14:34:00 -0500 Subject: [PATCH] refactor: unDRY PGRST prefix in errors for better search/grep --- src/PostgREST/Error.hs | 75 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/src/PostgREST/Error.hs b/src/PostgREST/Error.hs index 6df900d42..9c7d6d3a6 100644 --- a/src/PostgREST/Error.hs +++ b/src/PostgREST/Error.hs @@ -654,44 +654,45 @@ instance JSON.ToJSON ErrorCode where -- New group of errors will be added at the end of all the groups and will have the next prefix in the sequence -- New errors are added at the end of the group they belong to and will have the next code in the sequence buildErrorCode :: ErrorCode -> Text -buildErrorCode code = "PGRST" <> case code of - ConnectionErrorCode00 -> "000" - ConnectionErrorCode01 -> "001" - ConnectionErrorCode02 -> "002" - ConnectionErrorCode03 -> "003" +buildErrorCode code = case code of + -- Keep the "PGRST" prefix in every code for an easier search/grep + ConnectionErrorCode00 -> "PGRST000" + ConnectionErrorCode01 -> "PGRST001" + ConnectionErrorCode02 -> "PGRST002" + ConnectionErrorCode03 -> "PGRST003" - ApiRequestErrorCode00 -> "100" - ApiRequestErrorCode01 -> "101" - ApiRequestErrorCode02 -> "102" - ApiRequestErrorCode03 -> "103" - ApiRequestErrorCode05 -> "105" - ApiRequestErrorCode06 -> "106" - ApiRequestErrorCode07 -> "107" - ApiRequestErrorCode08 -> "108" - ApiRequestErrorCode09 -> "109" - ApiRequestErrorCode10 -> "110" - ApiRequestErrorCode11 -> "111" - ApiRequestErrorCode12 -> "112" - ApiRequestErrorCode14 -> "114" - ApiRequestErrorCode15 -> "115" - ApiRequestErrorCode16 -> "116" - ApiRequestErrorCode17 -> "117" - ApiRequestErrorCode18 -> "118" - ApiRequestErrorCode19 -> "119" - ApiRequestErrorCode20 -> "120" - ApiRequestErrorCode21 -> "121" - ApiRequestErrorCode22 -> "122" - ApiRequestErrorCode23 -> "123" - ApiRequestErrorCode24 -> "124" + ApiRequestErrorCode00 -> "PGRST100" + ApiRequestErrorCode01 -> "PGRST101" + ApiRequestErrorCode02 -> "PGRST102" + ApiRequestErrorCode03 -> "PGRST103" + ApiRequestErrorCode05 -> "PGRST105" + ApiRequestErrorCode06 -> "PGRST106" + ApiRequestErrorCode07 -> "PGRST107" + ApiRequestErrorCode08 -> "PGRST108" + ApiRequestErrorCode09 -> "PGRST109" + ApiRequestErrorCode10 -> "PGRST110" + ApiRequestErrorCode11 -> "PGRST111" + ApiRequestErrorCode12 -> "PGRST112" + ApiRequestErrorCode14 -> "PGRST114" + ApiRequestErrorCode15 -> "PGRST115" + ApiRequestErrorCode16 -> "PGRST116" + ApiRequestErrorCode17 -> "PGRST117" + ApiRequestErrorCode18 -> "PGRST118" + ApiRequestErrorCode19 -> "PGRST119" + ApiRequestErrorCode20 -> "PGRST120" + ApiRequestErrorCode21 -> "PGRST121" + ApiRequestErrorCode22 -> "PGRST122" + ApiRequestErrorCode23 -> "PGRST123" + ApiRequestErrorCode24 -> "PGRST124" - SchemaCacheErrorCode00 -> "200" - SchemaCacheErrorCode01 -> "201" - SchemaCacheErrorCode02 -> "202" - SchemaCacheErrorCode03 -> "203" - SchemaCacheErrorCode04 -> "204" + SchemaCacheErrorCode00 -> "PGRST200" + SchemaCacheErrorCode01 -> "PGRST201" + SchemaCacheErrorCode02 -> "PGRST202" + SchemaCacheErrorCode03 -> "PGRST203" + SchemaCacheErrorCode04 -> "PGRST204" - JWTErrorCode00 -> "300" - JWTErrorCode01 -> "301" - JWTErrorCode02 -> "302" + JWTErrorCode00 -> "PGRST300" + JWTErrorCode01 -> "PGRST301" + JWTErrorCode02 -> "PGRST302" - InternalErrorCode00 -> "X00" + InternalErrorCode00 -> "PGRSTX00"