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.

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

Batch aggregation #4303

Merged
merged 34 commits into from
Jun 13, 2024
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
883016a
Aggregation migration, model, spec, factory
zwolf Mar 6, 2024
5f2076b
Client & spec
zwolf Mar 6, 2024
6683ba5
Policy and spec
zwolf Mar 26, 2024
0adb3f1
Schemas
zwolf Mar 26, 2024
38e4efe
Update policy & schemas
zwolf Mar 27, 2024
d4067ec
Update status enum
zwolf Mar 27, 2024
2d8f8e2
Add default to status migration
zwolf Mar 27, 2024
7db71c9
Update serializer
zwolf Mar 27, 2024
3a88a0c
Update factory
zwolf Mar 27, 2024
03ffb51
Controller and spec
zwolf Mar 27, 2024
b3b7292
Fix migration
zwolf Mar 27, 2024
9b8d423
Hound
zwolf Mar 27, 2024
a16c421
Hound again
zwolf Mar 27, 2024
ea565fb
Third round hound
zwolf Mar 27, 2024
f6440bd
Feed hound
zwolf Mar 27, 2024
25e1843
Consistency
zwolf Mar 27, 2024
ec55ab9
Merge branch 'master' into batch-aggregation
zwolf Mar 28, 2024
50f14c1
Add project_id to Aggregations to allow Doorkeeper to scope by project
zwolf May 24, 2024
83be921
Merge branch 'batch-aggregation' of github.com:zooniverse/panoptes in…
zwolf May 24, 2024
ee47747
Clarify admin specs, add collab spec
zwolf May 24, 2024
0271b4c
Remove ignored_columns
zwolf May 24, 2024
2fccdb7
Add spec for failed service connections
zwolf May 24, 2024
4f1d46c
Add serializer spec
zwolf May 28, 2024
a08dbd1
Implement #destroy, add error specs for collisions
zwolf May 28, 2024
d97e027
Aggregation documentation
zwolf May 28, 2024
b90bdcc
reorder spec
zwolf May 28, 2024
419dc65
Merge branch 'master' into batch-aggregation
zwolf May 28, 2024
c350406
Merge branch 'batch-aggregation' of github.com:zooniverse/panoptes in…
zwolf May 28, 2024
b175f36
Fix hash alignment
zwolf May 28, 2024
cc1fbfe
Remove aggregation association from subject
zwolf May 30, 2024
871a147
Remove user uniqueness constraint
zwolf May 30, 2024
1923b00
Merge branch 'master' into batch-aggregation
zwolf Jun 10, 2024
99cb844
MIgrate database, update structure.sql
zwolf Jun 10, 2024
7009cf4
Resolve migrations
zwolf Jun 10, 2024
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
Prev Previous commit
Next Next commit
Remove ignored_columns
zwolf committed May 24, 2024
commit 0271b4c0008b8a9103c40471cbbd5aa661fd36f3
2 changes: 0 additions & 2 deletions app/models/aggregation.rb
Original file line number Diff line number Diff line change
@@ -9,8 +9,6 @@ class Aggregation < ApplicationRecord
validates :user, presence: true
validates :user_id, uniqueness: { scope: :workflow_id }

self.ignored_columns = %w[subject_id aggregation]

enum status: {
created: 0,
pending: 1,