Skip to content

142117 - changes for update/inserting user role for anonymous user #41

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.

Sign up for GitHub

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

Open
yogeshsarmalkar-trigyn wants to merge 2 commits into
base: oci-5.1.0-gthub-99-release-4.9.0_RC2
Choose a base branch
from
Open

142117 - changes for update/inserting user role for anonymous user #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
006cbb6
142117 - changes for update/inserting user role for anonymous user
yogeshsarmalkar-trigyn Apr 22, 2024
83c8731
142117 - added missing ) which was throwing error during build
yogeshsarmalkar-trigyn Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...ce-profile-updater/src/main/scala/org/sunbird/dp/deviceprofile/domain/DeviceProfile.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class DeviceProfile() {
private var apiLastUpdatedOn: Long = 0L
private val gson = new Gson
private val `type` = new TypeToken[util.HashMap[String, String]]() {}.getType
private var userSelectedRole: String = _

this.countryCode = ""
this.country = ""
Expand All @@ -47,6 +48,7 @@ class DeviceProfile() {
this.firstAccess = 0L
this.userDeclaredOn = 0L
this.apiLastUpdatedOn = 0L
this.userSelectedRole = ""

def toMap(config: DeviceProfileUpdaterConfig): util.Map[String, String] = {
val values = new util.HashMap[String, String]
Expand All @@ -65,6 +67,7 @@ class DeviceProfile() {
values.put(config.firstAccess, DeviceProfile.getValueOrDefault(String.valueOf(this.firstAccess), ""))
values.put(config.userDeclaredOn, DeviceProfile.getValueOrDefault(String.valueOf(this.userDeclaredOn), ""))
values.put(config.apiLastUpdatedOn, DeviceProfile.getValueOrDefault(String.valueOf(this.apiLastUpdatedOn), ""))
values.put(config.userSelectedRole, DeviceProfile.getValueOrDefault(this.userSelectedRole, ""))
values
}

Expand All @@ -84,6 +87,7 @@ class DeviceProfile() {
this.firstAccess = map.getOrDefault("first_access", "0").asInstanceOf[Number].longValue()
this.userDeclaredOn = map.getOrDefault(config.apiLastUpdatedOn, "0").asInstanceOf[Number].longValue()
this.apiLastUpdatedOn = map.getOrDefault(config.apiLastUpdatedOn, "0").asInstanceOf[Number].longValue()
this.userSelectedRole = map.getOrDefault(config.userSelectedRole, "")
this
}
}
Expand Down
7 changes: 7 additions & 0 deletions .../src/main/scala/org/sunbird/dp/deviceprofile/functions/DeviceProfileUpdaterFunction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,13 @@ class DeviceProfileUpdaterFunction(config: DeviceProfileUpdaterConfig,
*/
val postgresQuery = String.format("INSERT INTO %s (api_last_updated_on,updated_date,%s) VALUES(?,?,%s?) ON CONFLICT(device_id) DO UPDATE SET (api_last_updated_on,updated_date,%s)=(?,?,%s?);", config.postgresTable, columns, values, columns, values)

logger.debug("postgresQuery:::::::::::::::::::" + postgresQuery);
logger.info("postgresQuery:::::::::::::::::::" + postgresQuery);
logger.debug("columns:::::::::::::::::::" + columns);
logger.info("columns:::::::::::::::::::" + columns);
logger.debug("values:::::::::::::::::::" + values);
logger.info("values:::::::::::::::::::" + values);

val preparedStatement = postgresConnect.getConnection.prepareStatement(postgresQuery)
preparedStatement.setTimestamp(1, new Timestamp(lastUpdatedDate)) // Adding api_last_updated_on as timestamp to index 1 of preparestatement

Expand Down
3 changes: 2 additions & 1 deletion ...updater/src/main/scala/org/sunbird/dp/deviceprofile/task/DeviceProfileUpdaterConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,10 @@ class DeviceProfileUpdaterConfig(override val config: Config) extends BaseJobCon
val userDeclaredOn = "user_declared_on"
val apiLastUpdatedOn = "api_last_updated_on"
val deviceId = "device_id"
val userSelectedRole = "user_selected_role"

val fields = List(countryCode, country, stateCode, state, city, districtCustom, stateCustom, stateCustomCode,
userDeclaredDistrict, uaSpec, deviceSpec, firstAccess, userDeclaredOn, apiLastUpdatedOn
userDeclaredDistrict, uaSpec, deviceSpec, firstAccess, userDeclaredOn, apiLastUpdatedOn, userSelectedRole
)

// Consumers
Expand Down