Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
sunbird-lms-service
Commits
60c00ba7
Unverified
Commit
60c00ba7
authored
3 years ago
by
Reshmi V Nair
Committed by
GitHub
3 years ago
Browse files
Options
Download
Patches
Plain Diff
SB-26474 Support for multiple Consent Statuses (#974)
* SB-26474 Support for multiple Consent Statuses
parent
395fd443
release-4.4.1
release-4.4.0
release-4.4.1_RC1
release-4.4.0_RC15
release-4.4.0_RC14
release-4.4.0_RC13
release-4.4.0_RC12
release-4.4.0_RC11
release-4.4.0_RC10
release-4.4.0_RC9
release-4.4.0_RC8
release-4.4.0_RC7
release-4.4.0_RC6
release-4.4.0_RC5
release-4.4.0_RC4
release-4.4.0_RC3
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
controller/app/controllers/usermanagement/validator/UserConsentRequestValidator.java
+2
-1
...usermanagement/validator/UserConsentRequestValidator.java
core/platform-common/src/main/resources/externalresource.properties
+1
-1
...orm-common/src/main/resources/externalresource.properties
service/src/main/java/org/sunbird/actor/userconsent/UserConsentActor.java
+1
-0
.../java/org/sunbird/actor/userconsent/UserConsentActor.java
with
4 additions
and
2 deletions
+4
-2
controller/app/controllers/usermanagement/validator/UserConsentRequestValidator.java
+
2
−
1
View file @
60c00ba7
...
...
@@ -12,7 +12,8 @@ public class UserConsentRequestValidator extends BaseRequestValidator {
enum
CONSENT_STATUS
{
ACTIVE
,
REVOKED
;
REVOKED
,
DELETED
;
}
/**
* This method will validate the mandatory param in the read request.
...
...
This diff is collapsed.
Click to expand it.
core/platform-common/src/main/resources/externalresource.properties
+
1
−
1
View file @
60c00ba7
...
...
@@ -36,7 +36,7 @@ sunbird_otp_allowed_attempt=2
#Telemetry producer related info
telemetry_pdata_id
=
local.sunbird.learning.service
telemetry_pdata_pid
=
learning-service
telemetry_pdata_ver
=
4.
1
.0
telemetry_pdata_ver
=
4.
4
.0
#elastic search top n result count for telemetry
searchTopN
=
5
ekstep.channel.update.api.url
=
/channel/v3/update
...
...
This diff is collapsed.
Click to expand it.
service/src/main/java/org/sunbird/actor/userconsent/UserConsentActor.java
+
1
−
0
View file @
60c00ba7
...
...
@@ -117,6 +117,7 @@ public class UserConsentActor extends BaseActor {
List
<
Map
<
String
,
Object
>>
consentResponseList
=
consentDBList
.
stream
()
.
filter
(
consents
->((
String
)
consents
.
get
(
JsonKey
.
STATUS
)).
equalsIgnoreCase
(
JsonKey
.
ACTIVE
))
.
map
(
consent
->
{
Map
<
String
,
Object
>
consentRes
=
new
HashMap
<
String
,
Object
>();
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets