-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(#2724): move drep list pagination directly to sql #2865
Open
MSzalowski
wants to merge
1
commit into
develop
Choose a base branch
from
feat/2724-move-drep-list-pagination-directly-to-sql
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+488
−326
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,6 +43,7 @@ import VVA.Network as Network | |
import qualified VVA.Proposal as Proposal | ||
import qualified VVA.Transaction as Transaction | ||
import qualified VVA.Types as Types | ||
import VVA.Common.Types | ||
import VVA.Types (App, AppEnv (..), | ||
AppError (CriticalError, InternalError, ValidationError), | ||
CacheEnv (..)) | ||
|
@@ -140,60 +141,24 @@ delegationToResponse Types.Delegation {..} = | |
drepList :: App m => Maybe Text -> [DRepStatus] -> Maybe DRepSortMode -> Maybe Natural -> Maybe Natural -> m ListDRepsResponse | ||
drepList mSearchQuery statuses mSortMode mPage mPageSize = do | ||
CacheEnv {dRepListCache} <- asks vvaCache | ||
dreps <- cacheRequest dRepListCache (fromMaybe "" mSearchQuery) (DRep.listDReps mSearchQuery) | ||
|
||
let filterDRepsByQuery = case mSearchQuery of | ||
Nothing -> filter $ \Types.DRepRegistration {..} -> | ||
dRepRegistrationType /= Types.SoleVoter | ||
Just query -> filter $ \Types.DRepRegistration {..} -> | ||
let searchLower = Text.toLower query | ||
viewLower = Text.toLower dRepRegistrationView | ||
hashLower = Text.toLower dRepRegistrationDRepHash | ||
in case dRepRegistrationType of | ||
Types.SoleVoter -> | ||
searchLower == viewLower || searchLower == hashLower | ||
Types.DRep -> | ||
True | ||
|
||
|
||
let filterDRepsByStatus = case statuses of | ||
[] -> id | ||
_ -> filter $ \Types.DRepRegistration {..} -> | ||
mapDRepStatus dRepRegistrationStatus `elem` statuses | ||
|
||
randomizedOrderList <- mapM (\_ -> randomRIO (0, 1 :: Double)) dreps | ||
|
||
let sortDReps = case mSortMode of | ||
Nothing -> id | ||
Just Random -> fmap snd . sortOn fst . Prelude.zip randomizedOrderList | ||
Just VotingPower -> sortOn $ \Types.DRepRegistration {..} -> | ||
Down dRepRegistrationVotingPower | ||
Just RegistrationDate -> sortOn $ \Types.DRepRegistration {..} -> | ||
Down dRepRegistrationLatestRegistrationDate | ||
Just Status -> sortOn $ \Types.DRepRegistration {..} -> | ||
dRepRegistrationStatus | ||
|
||
appEnv <- ask | ||
|
||
allValidDReps <- liftIO $ mapConcurrently | ||
(\[email protected]{..} -> do | ||
let drep = drepRegistrationToDrep d | ||
return drep) | ||
$ sortDReps $ filterDRepsByQuery $ filterDRepsByStatus dreps | ||
|
||
let page = (fromIntegral $ fromMaybe 0 mPage) :: Int | ||
pageSize = (fromIntegral $ fromMaybe 10 mPageSize) :: Int | ||
let page = fromMaybe 0 mPage | ||
let pageSize = fromMaybe 10 mPageSize | ||
let offset = page * pageSize | ||
let sortMode = fromMaybe VotingPower mSortMode | ||
|
||
total = length allValidDReps :: Int | ||
let cacheKey = pack (show (mSearchQuery, statuses, sortMode, page, pageSize)) | ||
|
||
let elements = take pageSize $ drop (page * pageSize) allValidDReps | ||
return $ ListDRepsResponse | ||
{ listDRepsResponsePage = fromIntegral page | ||
, listDRepsResponsePageSize = fromIntegral pageSize | ||
, listDRepsResponseTotal = fromIntegral total | ||
, listDRepsResponseElements = elements | ||
} | ||
(totalCount, cachedDReps) <- cacheRequest dRepListCache cacheKey $ | ||
DRep.listDReps mSearchQuery statuses (Just sortMode) (fromIntegral pageSize) (fromIntegral offset) | ||
|
||
let response = ListDRepsResponse | ||
{ listDRepsResponsePage = fromIntegral page | ||
, listDRepsResponsePageSize = fromIntegral pageSize | ||
, listDRepsResponseTotal = fromIntegral totalCount | ||
, listDRepsResponseElements = cachedDReps | ||
} | ||
return response | ||
|
||
getVotingPower :: App m => HexText -> m Integer | ||
getVotingPower (unHexText -> dRepId) = do | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So in the end it is useful, isn't it?