mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-18 22:14:23 +00:00
Code Issues Releases Wiki Activity

Show locks in the case where you have an expired unlock request (#507)

Browse Source 
* Show locks in the case where you have an expired unlock request
This commit is contained in:
gbrodman
2020-03-06 22:00:42 -05:00
committed by GitHub
parent 28d3af0ee9
commit f83f8f92a3
5 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/google/registry/ui/server/registrar/RegistryLockGetAction.java
+3 -2
View File
@@ -159,12 +159,12 @@ public final class RegistryLockGetAction implements JsonGetAction {
() ->
RegistryLockDao.getLocksByRegistrarId(clientId).stream()
.filter(lock -> !lock.isLockRequestExpired(jpaTm().getTransactionTime()))
.filter(lock -> !lock.isUnlockRequestExpired(jpaTm().getTransactionTime()))
.map(lock -> lockToMap(lock, isAdmin))
.collect(toImmutableList()));
}
private ImmutableMap<String, ?> lockToMap(RegistryLock lock, boolean isAdmin) {
DateTime now = jpaTm().getTransactionTime();
return new ImmutableMap.Builder<String, Object>()
.put(FULLY_QUALIFIED_DOMAIN_NAME_PARAM, lock.getDomainName())
.put(
@@ -174,7 +174,8 @@ public final class RegistryLockGetAction implements JsonGetAction {
.put(
IS_UNLOCK_PENDING_PARAM,
lock.getUnlockRequestTimestamp().isPresent()
&& !lock.getUnlockCompletionTimestamp().isPresent())
&& !lock.getUnlockCompletionTimestamp().isPresent()
&& !lock.isUnlockRequestExpired(now))
.put(USER_CAN_UNLOCK_PARAM, isAdmin || !lock.isSuperuser())
.build();
}