Fixes #: Activity feed creation API restrictions and UI JSON parsing crash #26679
+340
−15
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -502,11 +502,15 @@ public Thread getTask(EntityLink about, TaskType taskType, TaskStatus taskStatus | |
| private Thread createThread(ThreadContext threadContext) { | ||
| Thread thread = threadContext.getThread(); | ||
| if (thread.getType() == ThreadType.Task) { | ||
| validateTaskDetails(thread); | ||
| validateAssignee(thread); | ||
| thread.getTask().withId(getNextTaskId()); | ||
| } else if (thread.getType() == ThreadType.Announcement) { | ||
| // Validate start and end time for announcement | ||
| validateAnnouncement(thread); | ||
| } else if (thread.getTask() != null) { | ||
| throw new IllegalArgumentException( | ||
| "taskDetails can only be provided for threads of type Task"); | ||
| } | ||
|
Comment on lines
502
to
514
There was a problem hiding this comment.
|
||
| store(threadContext); | ||
| storeRelationships(threadContext); | ||
|
|
@@ -1189,6 +1193,45 @@ private static long convertSecondsToMilliseconds(long seconds) { | |
| .toEpochMilli(); | ||
| } | ||
|
|
||
| private void validateTaskDetails(Thread thread) { | ||
| TaskDetails task = thread.getTask(); | ||
| if (task == null) { | ||
| throw new IllegalArgumentException("taskDetails is required for threads of type Task"); | ||
| } | ||
| switch (task.getType()) { | ||
| case RequestTag, UpdateTag -> { | ||
| validateTagLabelArray(task.getOldValue(), "oldValue", task.getType()); | ||
| validateTagLabelArray(task.getSuggestion(), "suggestion", task.getType()); | ||
| } | ||
| case RequestTestCaseFailureResolution, RecognizerFeedbackApproval -> { | ||
| rejectField(task.getOldValue(), "oldValue", task.getType()); | ||
| rejectField(task.getSuggestion(), "suggestion", task.getType()); | ||
| } | ||
| case RequestDescription, UpdateDescription, RequestApproval, Generic -> {} | ||
| } | ||
|
Comment on lines
+1201
to
+1211
There was a problem hiding this comment. 💡 Edge Case: Switch on TaskType lacks default branch for future enum valuesThe switch at line 1201 explicitly lists all 8 current Suggested fix: Was this helpful? React with 👍 / 👎 | Reply |
||
| } | ||
|
gitar-bot[bot] marked this conversation as resolved.
|
||
|
|
||
| private void rejectField(Object value, String fieldName, TaskType taskType) { | ||
| if (value != null) { | ||
| throw new IllegalArgumentException( | ||
| String.format("taskDetails.%s is not applicable for task type %s", fieldName, taskType)); | ||
| } | ||
| } | ||
|
|
||
| private void validateTagLabelArray(String value, String fieldName, TaskType taskType) { | ||
| if (value == null) { | ||
| return; | ||
| } | ||
| try { | ||
| JsonUtils.readObjects(value, TagLabel.class); | ||
| } catch (Exception e) { | ||
| throw new IllegalArgumentException( | ||
| String.format( | ||
| "taskDetails.%s must be a valid JSON array of tags for task type %s", | ||
| fieldName, taskType)); | ||
| } | ||
| } | ||
|
|
||
| private void validateAssignee(Thread thread) { | ||
| if (thread != null && ThreadType.Task.equals(thread.getType())) { | ||
| String createdByUserName = thread.getCreatedBy(); | ||
|
|
||
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.
The new integration coverage validates that
Conversationthreads with non-nulltaskDetailsare rejected, but it doesn’t coverAnnouncementthreads carryingtaskDetails. SincecreateThreadhas a dedicatedAnnouncementbranch, adding a similar 400 test forThreadType.Announcementwould help prevent regressions where announcements accidentally accept and persist task payloads.