Skip to content

Commit 312e028

Browse files
committed
Merge branch 'feat/feedback-enhancement' of https://github.com/DudeUnleashed/doubtfire-api into DudeUnleashed-feat/feedback-enhancement
2 parents ecc2899 + 655493f commit 312e028

36 files changed

+2405
-97
lines changed

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ source 'https://rubygems.org'
44

55
# Ruby versions for various enviornments
66
ruby_versions = {
7-
development: '~>3.1.0',
8-
test: '~>3.1.0',
9-
staging: '~>3.1.0',
10-
production: '~>3.1.0'
7+
development: '~>3.1.4',
8+
test: '~>3.1.4',
9+
staging: '~>3.1.4',
10+
production: '~>3.1.4'
1111
}
1212
# Get the ruby version for the current enviornment
1313
ruby ruby_versions[(ENV['RAILS_ENV'] || 'development').to_sym]

app/api/api_root.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ class ApiRoot < Grape::API
9999
mount WebcalApi
100100
mount WebcalPublicApi
101101

102+
mount Feedback::FeedbackChipApi
103+
102104
#
103105
# Add auth details to all end points
104106
#
@@ -139,6 +141,7 @@ class ApiRoot < Grape::API
139141
AuthenticationHelpers.add_auth_to TestAttemptsApi
140142

141143
AuthenticationHelpers.add_auth_to D2lIntegrationApi::D2lApi
144+
AuthenticationHelpers.add_auth_to Feedback::FeedbackChipApi
142145

143146
add_swagger_documentation \
144147
base_path: nil,
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
module Entities
22
class LearningOutcomeEntity < Grape::Entity
33
expose :id
4-
expose :ilo_number
4+
expose :context_type
5+
expose :context_id
56
expose :abbreviation
6-
expose :name
7-
expose :description
7+
expose :short_description
8+
expose :full_outcome_description
9+
expose :linked_outcome_ids do |learning_outcome, options|
10+
learning_outcome.linked_outcomes.pluck(:id)
11+
end
812
end
913
end

app/api/entities/task_definition_entity.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,7 @@ def staff?(my_role)
5050
expose :overseer_image_id, if: ->(unit, options) { staff?(options[:my_role]) }, expose_nil: false
5151
expose :assessment_enabled, if: ->(unit, options) { staff?(options[:my_role]) }
5252
expose :moss_language, if: ->(unit, options) { staff?(options[:my_role]) }, expose_nil: false
53+
54+
expose :learning_outcomes, using: LearningOutcomeEntity, as: :ilos
5355
end
5456
end
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
module Feedback
2+
module Entities
3+
class FeedbackChipEntity < Grape::Entity
4+
expose :id
5+
expose :type do |chip|
6+
case chip.type
7+
when 'Feedback::FeedbackTemplateChip'
8+
'template'
9+
when 'Feedback::FeedbackGroupChip'
10+
'group'
11+
else
12+
'unknown'
13+
end
14+
end
15+
expose :chip_text
16+
expose :description
17+
expose :task_status
18+
expose :parent_chip_id
19+
expose :learning_outcome_id
20+
expose :summary_text
21+
expose :comment_text
22+
end
23+
end
24+
end
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
module Feedback
2+
module Entities
3+
class FeedbackGroupChipEntity < Grape::Entity
4+
expose :id
5+
expose :type do |chip|
6+
case chip.type
7+
when 'Feedback::FeedbackTemplateChip'
8+
'template'
9+
when 'Feedback::FeedbackGroupChip'
10+
'group'
11+
else
12+
'unknown'
13+
end
14+
end
15+
expose :chip_text
16+
expose :description
17+
expose :parent_chip_id
18+
expose :learning_outcome_id
19+
end
20+
end
21+
end
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
module Feedback
2+
module Entities
3+
class FeedbackTemplateChipEntity < Grape::Entity
4+
expose :id
5+
expose :type do |chip|
6+
case chip.type
7+
when 'Feedback::FeedbackTemplateChip'
8+
'template'
9+
when 'Feedback::FeedbackGroupChip'
10+
'group'
11+
else
12+
'unknown'
13+
end
14+
end
15+
expose :chip_text
16+
expose :description
17+
expose :task_status
18+
expose :parent_chip_id
19+
expose :learning_outcome_id
20+
21+
expose :comment_text
22+
expose :summary_text
23+
end
24+
end
25+
end

0 commit comments

Comments
 (0)