Skip to content

Commit 7e581ee

Browse files
pstaabppstaabp
committed
FIX: change assessor names of dbix::classes.
1 parent cf472ea commit 7e581ee

21 files changed

+77
-87
lines changed

‎lib/DB/Schema/Result/Course.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ __PACKAGE__->set_primary_key('course_id');
6666

6767
# set up the many-to-many relationship to users
6868
__PACKAGE__->has_many(course_users => 'DB::Schema::Result::CourseUser', 'course_id');
69-
__PACKAGE__->many_to_many(users => 'course_users', 'users');
69+
__PACKAGE__->many_to_many(users => 'course_users', 'user');
7070

7171
# set up the one-to-many relationship to problem_sets
7272
__PACKAGE__->has_many(problem_sets => 'DB::Schema::Result::ProblemSet', 'course_id');

‎lib/DB/Schema/Result/CourseUser.pm

+3-4
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,15 @@ __PACKAGE__->add_columns(
133133
__PACKAGE__->set_primary_key('course_user_id');
134134
__PACKAGE__->add_unique_constraint([qw/course_id user_id/]);
135135

136-
__PACKAGE__->belongs_to(users => 'DB::Schema::Result::User', 'user_id');
137-
__PACKAGE__->belongs_to(courses => 'DB::Schema::Result::Course', 'course_id');
136+
__PACKAGE__->belongs_to(user => 'DB::Schema::Result::User', 'user_id');
137+
__PACKAGE__->belongs_to(course => 'DB::Schema::Result::Course', 'course_id');
138138

139139
__PACKAGE__->has_many(user_sets => 'DB::Schema::Result::UserSet', 'course_user_id');
140140

141141
# The cascade_delete => 0 prevents the role from being deleted if the course_user is deleted.
142142
__PACKAGE__->has_one(
143143
role => 'DB::Schema::Result::Role',
144-
{ 'foreign.role_id' => 'self.role_id' },
145-
{ cascade_delete => 0 }
144+
{ 'foreign.role_id' => 'self.role_id' }, { cascade_delete => 0 }
146145
);
147146

148147
=head2 C<valid_fields>

‎lib/DB/Schema/Result/DBPermRole.pm

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ __PACKAGE__->add_columns(
4949
__PACKAGE__->set_primary_key('db_perm_role_id');
5050
__PACKAGE__->add_unique_constraint([qw/db_perm_id role_id/]);
5151

52-
__PACKAGE__->belongs_to(perms => 'DB::Schema::Result::DBPermission', 'db_perm_id');
53-
__PACKAGE__->belongs_to(roles => 'DB::Schema::Result::Role', 'role_id');
52+
__PACKAGE__->belongs_to(db_permission => 'DB::Schema::Result::DBPermission', 'db_perm_id');
53+
__PACKAGE__->belongs_to(role => 'DB::Schema::Result::Role', 'role_id');
5454

5555
1;

‎lib/DB/Schema/Result/DBPermission.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ __PACKAGE__->add_columns(
6363

6464
__PACKAGE__->set_primary_key('db_perm_id');
6565
__PACKAGE__->has_many(db_perm_roles => 'DB::Schema::Result::DBPermRole', 'db_perm_id');
66-
__PACKAGE__->many_to_many(roles => 'db_perm_roles', 'roles');
66+
__PACKAGE__->many_to_many(roles => 'db_perm_roles', 'role');
6767

6868
1;

‎lib/DB/Schema/Result/PoolProblem.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,6 @@ sub required_params ($=) {
8383

8484
__PACKAGE__->set_primary_key('pool_problem_id');
8585

86-
__PACKAGE__->belongs_to(problem_pool_id => 'DB::Schema::Result::ProblemPool');
86+
__PACKAGE__->belongs_to(problem_pool => 'DB::Schema::Result::ProblemPool', 'problem_pool_id');
8787

8888
1;

‎lib/DB/Schema/Result/ProblemPool.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ __PACKAGE__->add_unique_constraint([qw/course_id pool_name/]);
5252

5353
__PACKAGE__->has_many(pool_problems => 'DB::Schema::Result::PoolProblem', 'problem_pool_id');
5454

55-
__PACKAGE__->belongs_to(courses => 'DB::Schema::Result::Course', 'course_id');
55+
__PACKAGE__->belongs_to(course => 'DB::Schema::Result::Course', 'course_id');
5656

5757
1;

‎lib/DB/Schema/Result/ProblemSet.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ __PACKAGE__->typecast_map(
142142
__PACKAGE__->set_primary_key('set_id');
143143
__PACKAGE__->add_unique_constraint([qw/course_id set_name/]);
144144

145-
__PACKAGE__->belongs_to(courses => 'DB::Schema::Result::Course', 'course_id');
145+
__PACKAGE__->belongs_to(course => 'DB::Schema::Result::Course', 'course_id');
146146
__PACKAGE__->has_many(problems => 'DB::Schema::Result::SetProblem', 'set_id');
147147
__PACKAGE__->has_many(user_sets => 'DB::Schema::Result::UserSet', 'set_id');
148148

‎lib/DB/Schema/Result/Role.pm

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ __PACKAGE__->add_columns(
4343
__PACKAGE__->set_primary_key('role_id');
4444
__PACKAGE__->add_unique_constraint([qw/role_name/]);
4545

46+
__PACKAGE__->belongs_to(course_user => 'DB::Schema::Result::CourseUser', 'role_id');
47+
4648
__PACKAGE__->has_many(db_perm_roles => 'DB::Schema::Result::DBPermRole', 'role_id');
47-
__PACKAGE__->many_to_many(db_perms => 'db_perm_roles', 'db_perms');
49+
__PACKAGE__->many_to_many(db_permissions => 'db_perm_roles', 'db_permission');
4850

4951
1;

‎lib/DB/Schema/Result/User.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@ __PACKAGE__->set_primary_key('user_id');
115115
__PACKAGE__->add_unique_constraint([qw/username/]);
116116

117117
__PACKAGE__->has_many(course_users => 'DB::Schema::Result::CourseUser', 'user_id');
118-
__PACKAGE__->many_to_many(courses => 'course_users', 'courses');
118+
__PACKAGE__->many_to_many(course => 'course_users', 'course');
119119

120120
1;

‎lib/DB/Schema/Result/UserProblem.pm

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ __PACKAGE__->add_columns(
6060

6161
__PACKAGE__->set_primary_key('user_problem_id');
6262

63-
__PACKAGE__->belongs_to(problems => 'DB::Schema::Result::SetProblem', 'set_problem_id');
64-
__PACKAGE__->belongs_to(user_sets => 'DB::Schema::Result::UserSet', 'user_set_id');
63+
__PACKAGE__->belongs_to(problem => 'DB::Schema::Result::SetProblem', 'set_problem_id');
64+
__PACKAGE__->belongs_to(user_set => 'DB::Schema::Result::UserSet', 'user_set_id');
6565

6666
__PACKAGE__->has_many(attempts => 'DB::Schema::Result::Attempt', 'user_problem_id');
6767

‎lib/DB/Schema/Result/UserSet.pm

+2-4
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,8 @@ __PACKAGE__->add_columns(
106106

107107
__PACKAGE__->set_primary_key('user_set_id');
108108
__PACKAGE__->add_unique_constraint([qw/set_id course_user_id set_version/]);
109-
__PACKAGE__->belongs_to(
110-
course_users => 'DB::Schema::Result::CourseUser',
111-
{ 'foreign.course_user_id' => 'self.course_user_id' }
112-
);
109+
__PACKAGE__->belongs_to(course_user => 'DB::Schema::Result::CourseUser', 'course_user_id');
110+
113111
__PACKAGE__->belongs_to(problem_set => 'DB::Schema::Result::ProblemSet', 'set_id');
114112
__PACKAGE__->has_many(user_problems => 'DB::Schema::Result::UserProblem', 'user_set_id');
115113

‎lib/DB/Schema/ResultSet/Course.pm

+2-4
Original file line numberDiff line numberDiff line change
@@ -238,16 +238,14 @@ sub getUserCourses ($self, %args) {
238238
my $user = $self->result_source->schema->resultset('User')
239239
->getGlobalUser(info => getUserInfo($args{info}), as_result_set => 1);
240240

241-
# my @user_courses = $user->courses->search({});
242-
243-
my @user_courses = $user->course_users->search({}, { prefetch => [qw/role/] });
241+
my @user_courses = $user->course_users;
244242

245243
return @user_courses if $args{as_result_set};
246244
my @user_courses_hashref = ();
247245
for my $user_course (@user_courses) {
248246

249247
my $params = {
250-
$user_course->get_inflated_columns, $user_course->courses->get_inflated_columns,
248+
$user_course->get_inflated_columns, $user_course->course->get_inflated_columns,
251249
role => $user_course->role->role_name
252250
};
253251
push(@user_courses_hashref, $params);

‎lib/DB/Schema/ResultSet/ProblemPool.pm

+8-8
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ sub getAllProblemPools ($self, %args) {
4444
my @problem_pools = $self->search({});
4545
return @problem_pools if $args{as_result_set};
4646
return map {
47-
{ $_->get_inflated_columns, course_name => $_->courses->course_name };
47+
{ $_->get_inflated_columns, course_name => $_->course->course_name };
4848
} @problem_pools;
4949
}
5050

@@ -59,10 +59,10 @@ sub getProblemPools ($self, %args) {
5959

6060
my @pools = $self->search(
6161
{
62-
'courses.course_id' => $course->course_id
62+
'course.course_id' => $course->course_id
6363
},
6464
{
65-
join => [qw/courses/]
65+
join => 'course'
6666
}
6767
);
6868

@@ -84,9 +84,9 @@ sub getProblemPool ($self, %args) {
8484
my $course = $self->rs('Course')->getCourse(info => getCourseInfo($args{info}), as_result_set => 1);
8585

8686
my $search_info = getPoolInfo($args{info});
87-
$search_info->{'courses.course_id'} = $course->course_id;
87+
$search_info->{'course.course_id'} = $course->course_id;
8888

89-
my $pool = $self->find($search_info, { join => [qw/courses/] });
89+
my $pool = $self->find($search_info, { join => 'course' });
9090

9191
unless ($pool) {
9292
my $course_name = $course->course_name;
@@ -112,10 +112,10 @@ sub addProblemPool ($self, %args) {
112112

113113
my $existing_pool = $self->find(
114114
{
115-
'courses.course_id' => $course->course_id,
116-
pool_name => $args{params}->{pool_name}
115+
'course.course_id' => $course->course_id,
116+
pool_name => $args{params}->{pool_name}
117117
},
118-
{ prefetch => [qw/courses/] }
118+
{ prefetch => 'course' }
119119
);
120120

121121
DB::Exception::PoolAlreadyInCourse->throw(

‎lib/DB/Schema/ResultSet/ProblemSet.pm

+5-5
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ sub getAllProblemSets ($self, %args) {
5555
my @all_sets = ();
5656
for my $set (@problem_sets) {
5757
my $expanded_set =
58-
{ $set->get_inflated_columns, $set->courses->get_inflated_columns, set_type => $set->set_type };
58+
{ $set->get_inflated_columns, $set->course->get_inflated_columns, set_type => $set->set_type };
5959
delete $expanded_set->{type};
6060
push(@all_sets, $expanded_set);
6161
}
@@ -134,11 +134,11 @@ sub getHWSets ($self, %args) {
134134
my $p = getCourseInfo($args{info}); # pull out the course_info that is passed
135135
my $search_params = {};
136136
for my $key (keys %$p) {
137-
$search_params->{"courses.$key"} = $p->{$key};
137+
$search_params->{"course.$key"} = $p->{$key};
138138
}
139139
$search_params->{'type'} = 1;
140140

141-
my @problem_sets = $self->search($search_params, { join => 'courses' });
141+
my @problem_sets = $self->search($search_params, { join => 'course' });
142142
my $sets = _formatSets(\@problem_sets);
143143
return $args{as_result_set} ? @problem_sets : @$sets;
144144
}
@@ -174,11 +174,11 @@ sub getQuizzes ($self, %args) {
174174
my $p = getCourseInfo($args{info}); # pull out the course_info that is passed
175175
my $search_params = {};
176176
for my $key (keys %$p) {
177-
$search_params->{"courses.$key"} = $p->{$key};
177+
$search_params->{"course.$key"} = $p->{$key};
178178
}
179179
$search_params->{'type'} = 2;
180180

181-
my @problem_sets = $self->search($search_params, { join => 'courses' });
181+
my @problem_sets = $self->search($search_params, { join => 'course' });
182182
my $sets = _formatSets(\@problem_sets);
183183
return $args{as_result_set} ? @problem_sets : @$sets;
184184
}

‎lib/DB/Schema/ResultSet/SetProblem.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ sub getSetProblem ($self, %args) {
176176
. ' is not found for set: '
177177
. $problem_set->set_name
178178
. ' is the course: '
179-
. $problem_set->courses->course_name
179+
. $problem_set->course->course_name
180180
) unless $problem;
181181

182182
return $problem if $args{as_result_set};

‎lib/DB/Schema/ResultSet/User.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ sub _getCourseUser {
569569
sub _getMergedUser {
570570
my $course_user = shift;
571571
return removeLoginParams({
572-
$course_user->get_inflated_columns, $course_user->users->get_inflated_columns,
572+
$course_user->get_inflated_columns, $course_user->user->get_inflated_columns,
573573
role => $course_user->role->role_name
574574
});
575575
}

‎lib/DB/Schema/ResultSet/UserProblem.pm

+17-17
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ sub getUserProblems ($self, %args) {
9595
my $course = $self->rs('Course')->getCourse(info => $args{info}, as_result_set => 1);
9696
my @user_problems = $self->search(
9797
{
98-
'courses.course_id' => $course->course_id
98+
'course.course_id' => $course->course_id
9999
},
100100
{
101-
join => { problems => { problem_set => 'courses' } }
101+
join => { problem => { problem_set => 'course' } }
102102
}
103103
);
104104

@@ -147,11 +147,11 @@ sub getUserProblemsForSet ($self, %args) {
147147
my $problem_set = $self->rs('ProblemSet')->getProblemSet(info => $args{info}, as_result_set => 1);
148148
my @user_problems = $self->search(
149149
{
150-
'courses.course_id' => $course->course_id,
150+
'course.course_id' => $course->course_id,
151151
'problem_set.set_id' => $problem_set->set_id
152152
},
153153
{
154-
join => { problems => { problem_set => 'courses' } }
154+
join => { problem => { problem_set => 'course' } }
155155
}
156156
);
157157

@@ -200,16 +200,16 @@ sub getUserProblemsForUser ($self, %args) {
200200
my $user = $self->rs('User')->getGlobalUser(info => $args{info}, as_result_set => 1);
201201
my @user_problems = $self->search(
202202
{
203-
'courses.course_id' => $course->course_id,
204-
'users.user_id' => $user->user_id
203+
'course.course_id' => $course->course_id,
204+
'user.user_id' => $user->user_id
205205
},
206206
{
207207
join => [
208208
{
209-
problems => { problem_set => 'courses' }
209+
problem => { problem_set => 'course' }
210210
},
211211
{
212-
user_sets => { course_users => 'users' }
212+
user_set => { course_user => 'user' }
213213
}
214214
]
215215
}
@@ -344,11 +344,11 @@ sub addUserProblem ($self, %args) {
344344
);
345345

346346
DB::Exception::UserProblemExists->throw(message => 'The user '
347-
. $user_problem->user_sets->course_users->users->username
347+
. $user_problem->user_set->course_user->user->username
348348
. ' already has problem number '
349-
. $user_problem->problems->problem_number
349+
. $user_problem->problem->problem_number
350350
. ' in set with name '
351-
. $user_problem->user_sets->problem_set->set_name)
351+
. $user_problem->user_set->problem_set->set_name)
352352
if $user_problem;
353353

354354
my $problem = $self->rs('SetProblem')->getSetProblem(info => $args{params}, as_result_set => 1);
@@ -560,11 +560,11 @@ sub checkParams ($self, $params) {
560560
sub _mergeUserProblem ($user_problem) {
561561
my $user_problem_fields = _getUserProblem($user_problem);
562562
delete $user_problem_fields->{problem_params};
563-
my $problem_fields = { $user_problem->problems->get_inflated_columns };
563+
my $problem_fields = { $user_problem->problem->get_inflated_columns };
564564
delete $problem_fields->{problem_params};
565565

566566
# Merge the params (problem_params and problem_params).
567-
my $params = updateAllFields($user_problem->problems->problem_params, $user_problem->problem_params);
567+
my $params = updateAllFields($user_problem->problem->problem_params, $user_problem->problem_params);
568568

569569
# Merge the main fields.
570570
my $merged_params = updateAllFields($problem_fields, $user_problem_fields);
@@ -576,10 +576,10 @@ sub _mergeUserProblem ($user_problem) {
576576
sub _getUserProblem ($user_problem) {
577577
return {
578578
$user_problem->get_inflated_columns,
579-
problem_number => $user_problem->problems->problem_number,
580-
username => $user_problem->user_sets->course_users->users->username,
581-
set_name => $user_problem->problems->problem_set->set_name,
582-
course_name => $user_problem->problems->problem_set->courses->course_name
579+
problem_number => $user_problem->problem->problem_number,
580+
username => $user_problem->user_set->course_user->user->username,
581+
set_name => $user_problem->problem->problem_set->set_name,
582+
course_name => $user_problem->problem->problem_set->course->course_name
583583
};
584584
}
585585

0 commit comments

Comments
 (0)