-
Notifications
You must be signed in to change notification settings - Fork 6
Received Feedback Request: 'Deny' Option #2622
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.
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
Draft
thelenw
wants to merge
12
commits into
develop
Choose a base branch
from
feature-1957/decline-received-feedback-request
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
1d20228
Added Feedback Request 'Deny' option
thelenw 7427a46
Fixed snapshots
thelenw 9e84a98
Merge branch 'develop' into feature-1957/decline-received-feedback-re…
thelenw 47ec47c
Pushing broken state to request help identifying ambiguous 400 error …
thelenw 05143b5
Updated files according to Michael's review, overcoming many errors t…
thelenw ff42a4e
Addressed Michael's review, updating Permissions. Migration versions …
thelenw b03ef7e
Reversioning migrations according to intermediate develop branch updates
thelenw 25f2e4c
Fixes for FeedbackRequestFixture to include 'Deny' functionality support
thelenw 7d15622
Attempt to resolve build test failure
thelenw 40cea76
Attempt to fix failing snapshot tests
thelenw ddad64d
Reverted vitest version to match tests
thelenw 695151f
Merge branch 'develop' into feature-1957/decline-received-feedback-re…
thelenw File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
57 changes: 57 additions & 0 deletions
57
...va/com/objectcomputing/checkins/services/feedback_request/DTO/DenyFeedbackRequestDTO.java
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 |
---|---|---|
@@ -0,0 +1,57 @@ | ||
package com.objectcomputing.checkins.services.feedback_request.DTO; | ||
|
||
import io.micronaut.core.annotation.Introspected; | ||
import jakarta.validation.Valid; | ||
import jakarta.validation.constraints.NotBlank; | ||
import jakarta.validation.constraints.NotNull; | ||
|
||
@Introspected | ||
|
||
public class DenyFeedbackRequestDTO { | ||
|
||
@NotBlank(message = "Reason cannot be blank") | ||
private String reason; | ||
|
||
@NotNull(message = "Denier cannot be null") | ||
@Valid | ||
private UserDTO denier; | ||
|
||
@NotNull(message = "Creator cannot be null") | ||
@Valid | ||
private UserDTO creator; | ||
|
||
// Constructors | ||
public DenyFeedbackRequestDTO() {} | ||
|
||
public DenyFeedbackRequestDTO(String reason, UserDTO denier, UserDTO creator) { | ||
this.reason = reason; | ||
this.denier = denier; | ||
this.creator = creator; | ||
} | ||
|
||
// Getters | ||
public String getReason() { | ||
return reason; | ||
} | ||
|
||
public UserDTO getDenier() { | ||
return denier; | ||
} | ||
|
||
public UserDTO getCreator() { | ||
return creator; | ||
} | ||
|
||
// Setters | ||
public void setReason(String reason) { | ||
this.reason = reason; | ||
} | ||
|
||
public void setDenier(UserDTO denier) { | ||
this.denier = denier; | ||
} | ||
|
||
public void setCreator(UserDTO creator) { | ||
this.creator = creator; | ||
} | ||
} |
51 changes: 51 additions & 0 deletions
51
server/src/main/java/com/objectcomputing/checkins/services/feedback_request/DTO/UserDTO.java
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 |
---|---|---|
@@ -0,0 +1,51 @@ | ||
package com.objectcomputing.checkins.services.feedback_request.DTO; | ||
|
||
import jakarta.validation.constraints.NotBlank; | ||
import jakarta.validation.constraints.NotNull; | ||
import java.util.UUID; | ||
|
||
import io.micronaut.core.annotation.Introspected; | ||
|
||
|
||
@Introspected | ||
|
||
public class UserDTO { | ||
|
||
@NotNull(message = "User ID cannot be null") | ||
private UUID id; | ||
|
||
@NotBlank(message = "User name cannot be blank") | ||
private String name; | ||
|
||
// Constructors | ||
public UserDTO() {} | ||
|
||
// Constructor with only ID (for cases where only ID is required) | ||
public UserDTO(UUID id) { | ||
this.id = id; | ||
} | ||
|
||
// Constructor with ID and name (for cases where both ID and name are required) | ||
public UserDTO(UUID id, String name) { | ||
this.id = id; | ||
this.name = name; | ||
} | ||
|
||
// Getters | ||
public UUID getId() { | ||
return id; | ||
} | ||
|
||
public String getName() { | ||
return name; | ||
} | ||
|
||
// Setters | ||
public void setId(UUID id) { | ||
this.id = id; | ||
} | ||
|
||
public void setName(String name) { | ||
this.name = name; | ||
} | ||
} |
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.