Skip to content
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

Feedback improvements #456

Merged
merged 2 commits into from
Mar 6, 2025
Merged

Feedback improvements #456

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
4ee908c
Correctly detect user type. Fix feedback without arbiter
madis Mar 5, 2025
4ea58c3
Record receiver role to have per-user-type feedbacks
madis Mar 5, 2025
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
1 change: 1 addition & 0 deletions server/src/ethlance/server/db/schema.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@
[[:job-story/id :integer not-nil]
[:message/id :integer not-nil]
[:feedback/rating :integer not-nil]
[:feedback/receiver-role :varchar]
[:user/id :varchar not-nil]

;; PK
Expand Down
33 changes: 25 additions & 8 deletions server/src/ethlance/server/graphql/resolvers.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,11 @@
[root {:keys [:limit :offset] :as args} _]
(db/with-async-resolver-conn conn
(let [{:keys [:user/id] :as employer} (graphql-utils/gql->clj root)
query (sql-helpers/merge-where user-feedback-query [:ilike id :JobStoryFeedbackMessage.user/id])]
query (sql-helpers/merge-where
user-feedback-query
[:and
[:ilike id :JobStoryFeedbackMessage.user/id]
[:= "employer" :JobStoryFeedbackMessage.feedback/receiver-role]])]
(log/debug "employer->feedback-resolver" {:employer employer :args args})
(<? (paged-query conn query limit offset)))))

Expand Down Expand Up @@ -341,7 +345,11 @@
(db/with-async-resolver-conn conn
(let [arbiter (graphql-utils/gql->clj root)
user-id (:user/id arbiter)
query (sql-helpers/merge-where user-feedback-query [:ilike user-id :JobStoryFeedbackMessage.user/id])]
query (sql-helpers/merge-where
user-feedback-query
[:and
[:ilike user-id :JobStoryFeedbackMessage.user/id]
[:= "arbiter" :JobStoryFeedbackMessage.feedback/receiver-role]])]
(log/debug "arbiter->feedback-resolver" {:arbiter arbiter :args args})
(<? (paged-query conn query limit offset)))))

Expand Down Expand Up @@ -381,10 +389,16 @@
message-id (:message/id feedback)
arbiter-status "accepted"
job-story-id (:job-story/id feedback)
where-condition [:and
[:= message-id :jsfm.message/id]
[:= job-story-id :js.job-story/id]
[:= arbiter-status :ja.job-arbiter/status]]
where-condition [:or
[:and
[:= message-id :jsfm.message/id]
[:= job-story-id :js.job-story/id]
[:!= :ja.job/id nil]
[:= arbiter-status :ja.job-arbiter/status]]
[:and
[:= message-id :jsfm.message/id]
[:= job-story-id :js.job-story/id]
[:!= :ja.job/id nil]]]
q (sql-helpers/merge-where feedback-user-type-query where-condition)]
(log/debug "feedback->user-type-resolver" user-type-column feedback)
(user-type-column (<? (db/get conn q))))))
Expand Down Expand Up @@ -646,7 +660,9 @@
(db/with-async-resolver-conn conn
(let [{:keys [:user/id] :as candidate} (graphql-utils/gql->clj root)
query (-> user-feedback-query
(sql-helpers/merge-where [:= id :JobStoryFeedbackMessage.user/id]))]
(sql-helpers/merge-where [:and
[:= id :JobStoryFeedbackMessage.user/id]
[:= "candidate" :JobStoryFeedbackMessage.feedback/receiver-role]]))]
(log/debug "candidate->feedback-resolver" {:candidate candidate :args args})
(<? (paged-query conn query limit offset)))))

Expand Down Expand Up @@ -1086,7 +1102,7 @@


(defn leave-feedback-mutation
[_ {:keys [:job-story/id :text :rating :to]} {:keys [current-user timestamp]}]
[_ {:keys [:job-story/id :text :rating :to :receiver-role]} {:keys [current-user timestamp]}]
;; Change JobStory status to "ended-by-feedback" when employer or candidate sends feedback
(db/with-async-resolver-tx conn
(let [job-story-id id
Expand All @@ -1112,6 +1128,7 @@
:message/creator current-user-id
:message/text text
:feedback/rating rating
:feedback/receiver-role receiver-role
:user/id to}))
(re-calculate-user-average-rating to job-story-id)

Expand Down
2 changes: 2 additions & 0 deletions server/src/tests/graphql/generator.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@
:job-story-message/type :feedback
:job-story/id story-id
:feedback/rating (rand-int 5)
:feedback/receiver-role "candidate"
:user/id candidate})))

;; feedback from the candidate to the employer
Expand All @@ -275,6 +276,7 @@
:job-story-message/type :feedback
:job-story/id story-id
:feedback/rating (rand-int 5)
:feedback/receiver-role "employer"
:user/id employer}))))))


Expand Down
2 changes: 1 addition & 1 deletion shared/src/ethlance/shared/graphql/schema.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
type Mutation {
signIn(dataSignature: String!, data: String!): signInPayload!
sendMessage(jobStory_id: Int!, text: String!, jobStoryMessage_type: Keyword, message_type: Keyword): Boolean!,
leaveFeedback(jobStory_id: Int!, text: String, rating: Int!, to: ID!): Boolean!,
leaveFeedback(jobStory_id: Int!, text: String, rating: Int!, to: ID!, receiverRole: Keyword!): Boolean!,
updateUser(user_id: String!, user: UserInput, candidate: CandidateInput, employer: EmployerInput, arbiter: ArbiterInput): User,
createJobProposal(input: ProposalInput): JobStory,
removeJobProposal(jobStory_id: ID!): JobStory,
Expand Down
9 changes: 6 additions & 3 deletions ui/src/ethlance/ui/page/job_contract.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
participants {:employer (get-in results [:job-story :job :job/employer :user])
:candidate (get-in results [:job-story :candidate :user])
:arbiter (get-in results [:job-story :job :job/arbiter :user])}

accepted-arbiter (get-in results [:job-story :job :job/arbiter :user])
normalized-feedback-users (map (fn [fb]
[(:feedback/from-user-type fb)
(:feedback/to-user-type fb)])
Expand All @@ -279,7 +279,8 @@

(and
(given-feedback? :employer :candidate)
(not (given-feedback? :employer :arbiter)))
(not (given-feedback? :employer :arbiter))
(not (nil? accepted-arbiter)))
:arbiter)

:candidate
Expand All @@ -289,7 +290,8 @@

(and
(given-feedback? :candidate :employer)
(not (given-feedback? :candidate :arbiter)))
(not (given-feedback? :candidate :arbiter))
(not (nil? accepted-arbiter)))
:arbiter)

:arbiter
Expand Down Expand Up @@ -347,6 +349,7 @@
{:job-story/id @job-story-id
:text @feedback-text
:rating @feedback-rating
:receiver-role feedback-receiver-role
:to (:user/id next-feedback-receiver)}])}
[c-button-label "Send Feedback"]]])]))

Expand Down
2 changes: 2 additions & 0 deletions ui/src/ethlance/ui/page/job_contract/events.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,11 @@
text (:text params)
rating (:rating params)
to (:to params)
receiver-role (:receiver-role params)
mutation-params {:job-story/id job-story-id
:text text
:rating rating
:receiver-role receiver-role
:to to}]
{:fx [[:dispatch [::gql-events/mutation {:queries [[:leave-feedback mutation-params]]
:on-success [::graphql-mutation-success]
Expand Down