IVYPORTAL-17694 Remove usages of deprecated methods Query#fromJson an… #1346
Conversation
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
…d Query#asJson - Replaced methods
| public TaskQuery createQuery() { | ||
| TaskQuery finalQuery = TaskQuery.create(); | ||
| setNewQueryCreated(isNewQueryCreated() || customTaskQuery == null || hasTaskId() || hasCaseId()); | ||
|
|
||
| if (!isNewQueryCreated()) { | ||
| finalQuery = TaskQuery.fromJson(customTaskQuery.asJson()); // clone to keep the original custom query | ||
| finalQuery.where().and(customTaskQuery); |
| @@ -63,7 +64,7 @@ public CaseQuery createQuery() { | |||
|
|
|||
| setNewQueryCreated(isNewQueryCreated() || customCaseQuery == null || hasCaseId()); | |||
| if (!isNewQueryCreated()) { | |||
| finalQuery.where().andOverall(CaseQuery.fromJson(customCaseQuery.asJson())); // clone to keep the original custom query | |||
| finalQuery.where().andOverall(customCaseQuery); | |||
| @@ -244,30 +245,30 @@ private ExpiryStatistic createExpiryTimeStampToCountMap(Recordset recordSet) thr | |||
| return expiryStatistic; | |||
| } | |||
|
|
|||
| @SuppressWarnings("deprecation") | |||
| private TaskQuery extendQueryWithUserHasPermissionToSee(TaskSearchCriteria criteria) { | |||
There was a problem hiding this comment.
Before
TaskService extendQueryWithUserHasPermissionToSee: SELECT
FROM IWA_Task
LEFT JOIN IWA_TaskLocalized IWA_TaskLocalized ON (Column(IWA_Task.TaskId) = Column(IWA_TaskLocalized.TaskId) && Column(IWA_TaskLocalized.LanguageId) IN (1))
LEFT JOIN IWA_TaskCustomStringField TskCstmStrngFld_HIDE ON (Column(IWA_Task.TaskId) = Column(IWA_TaskCustomStringField.TaskId) && Column(TskCstmStrngFld_HIDE.Name) = HIDE)
WHERE (((Column(IWA_Task.State) = 0 || Column(IWA_Task.State) = 4 || Column(IWA_Task.State) = 5 || Column(IWA_Task.State) = 8 || Column(IWA_Task.State) = 1 || Column(IWA_Task.State) = 6 || Column(IWA_Task.State) = 3 || Column(IWA_Task.State) = 7 || Column(IWA_Task.State) = 11 || Column(IWA_Task.State) = 10 || Column(IWA_Task.State) = 12) && (Column(IWA_TaskLocalized.Name) ~LIKE %loc% || Column(IWA_TaskLocalized.Description) ~LIKE %loc%)) && Column(TskCstmStrngFld_HIDE.Value) IS NULL)
ORDER BY Column(IWA_Task.ExpiryTimestamp) NULL_FIRST DESCENDING
((true & true) & true)
After
extendQueryWithUserHasPermissionToSee: SELECT
FROM IWA_Task
LEFT JOIN IWA_TaskLocalized IWA_TaskLocalized ON (Column(IWA_Task.TaskId) = Column(IWA_TaskLocalized.TaskId) && Column(IWA_TaskLocalized.LanguageId) IN (1))
LEFT JOIN IWA_TaskCustomStringField TskCstmStrngFld_HIDE ON (Column(IWA_Task.TaskId) = Column(IWA_TaskCustomStringField.TaskId) && Column(TskCstmStrngFld_HIDE.Name) = HIDE)
WHERE ((Column(IWA_Task.State) = 0 || Column(IWA_Task.State) = 4 || Column(IWA_Task.State) = 5 || Column(IWA_Task.State) = 8 || Column(IWA_Task.State) = 1 || Column(IWA_Task.State) = 6 || Column(IWA_Task.State) = 3 || Column(IWA_Task.State) = 7 || Column(IWA_Task.State) = 11 || Column(IWA_Task.State) = 10 || Column(IWA_Task.State) = 12) && (Column(IWA_TaskLocalized.Name) ~LIKE %loc% || Column(IWA_TaskLocalized.Description) ~LIKE %loc%) && Column(TskCstmStrngFld_HIDE.Value) IS NULL)
ORDER BY Column(IWA_Task.ExpiryTimestamp) NULL_FIRST DESCENDING
(true & true & true)
Basically correct
| @@ -281,7 +282,7 @@ private TaskQuery extendQueryWithInvolvedUser(TaskSearchCriteria criteria) { | |||
| } | |||
|
|
|||
| private TaskQuery extendQueryWithUserCanWorkOn(TaskSearchCriteria criteria) { | |||
| TaskQuery finalQuery = criteria.getFinalTaskQuery(); | |||
| TaskQuery finalQuery = criteria.createQuery(); | |||
There was a problem hiding this comment.
Before:
TaskService extendQueryWithUserCanWorkOn: SELECT
FROM IWA_Task
LEFT JOIN IWA_TaskCustomStringField TskCstmStrngFld_HIDE ON (Column(IWA_Task.TaskId) = Column(IWA_TaskCustomStringField.TaskId) && Column(TskCstmStrngFld_HIDE.Name) = HIDE)
WHERE ((Column(IWA_Task.BusinessState) = 2 || Column(IWA_Task.BusinessState) = 1 || Column(IWA_Task.BusinessState) = 0) && (Column(IWA_Task.WorkerId) = Column(IWA_Task.WorkerId) && Column(IWA_Task.State) IN (0, 4, 5, 8)) && Column(TskCstmStrngFld_HIDE.Value) IS NULL)
(true & true & true)
After
TaskService extendQueryWithUserCanWorkOn: SELECT
FROM IWA_Task
LEFT JOIN IWA_TaskCustomStringField TskCstmStrngFld_HIDE ON (Column(IWA_Task.TaskId) = Column(IWA_TaskCustomStringField.TaskId) && Column(TskCstmStrngFld_HIDE.Name) = HIDE)
WHERE (((Column(IWA_Task.BusinessState) = 2 || Column(IWA_Task.BusinessState) = 1 || Column(IWA_Task.BusinessState) = 0) && (Column(IWA_Task.WorkerId) = Column(IWA_Task.WorkerId) && Column(IWA_Task.State) IN (0, 4, 5, 8))) && Column(TskCstmStrngFld_HIDE.Value) IS NULL)
((true & true) & true)
So basically correct
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
…d Query#asJson