Merge pull request #58 from pstaabp/create-model-class

Create model class

Author: drgrice1

.eslintrc.js

@@ -46,7 +46,6 @@ module.exports = {
 		__statics: 'readonly',
 		process: 'readonly'
 	},
-
 	rules: baseRules,
 
 	overrides: [{
@@ -81,7 +80,8 @@ module.exports = {
 
 			// TypeScript
 			'@typescript-eslint/explicit-function-return-type': 'off',
-			'@typescript-eslint/explicit-module-boundary-types': 'off'
+			'@typescript-eslint/explicit-module-boundary-types': 'off',
+			'@typescript-eslint/restrict-template-expressions': ['error', {allowBoolean: true, allNumbers: true }],
 		}
 
 	}],

.github/workflows/linter.yml

@@ -56,10 +56,7 @@ jobs:
       # Run Linter against code base #
       ################################
       - name: Super-Linter
-        # Note that this actually uses super-linter version 4.6.0 which is the desired version.
-        # See https://github.com/github/super-linter/issues/1839.
-        # It seems that version 4.6.1 has a bug with perlcritic, so we actually want 4.6.0.
-        uses: github/[email protected]
+        uses: github/[email protected]
 
         env:
           VALIDATE_ALL_CODEBASE: false
@@ -72,7 +69,7 @@ jobs:
           CSS_FILE_NAME: .stylelintrc.js
           VALIDATE_TYPESCRIPT_STANDARD: false
           VALIDATE_JAVASCRIPT_STANDARD: false
-          FILTER_REGEX_EXCLUDE: .*/we_b_wor_k3.yml
+          FILTER_REGEX_EXCLUDE: (.*/we_b_wor_k3.yml|.*.csv)
 
   perltidy:
     name: Run perltidy on Perl Files

.github/workflows/unit-tests.yml

@@ -13,7 +13,7 @@ jobs:
     container: drgrice1/webwork3
     steps:
       - uses: actions/checkout@v2
-      - name: Run unit tests
+      - name: Run perl unit tests
         env:
           HARNESS_PERL_SWITCHES: -MDevel::Cover
         run: |
@@ -32,3 +32,13 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: cover -report codecov
+
+      # Install node (for npm) and use it to install eslint and stylelint dependencies.
+      - name: Use Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: Install Dependencies
+        run: npm ci
+      - name: Run typescript (client-side) tests
+        run: npm run test

conf/ww3-dev.yml

@@ -0,0 +1,28 @@
+---
+secrets:
+  - 3cdf63327fcf77deaed1d200df4b9fee66af2326
+webwork3_home: /opt/webwork/webwork3
+
+# Database settings
+
+# These settings are used for running unit_tests.  You should choose a database
+# that is separate from any either production or other testing database.  The
+# sqlite one is recommended.  If you choose another full-featured DB, select a
+# database that is different than others.
+
+# For the sqlite database
+test_database_dsn: dbi:SQLite:/opt/webwork/webwork3/t/db/sample_db.sqlite
+# For mysql or mariadb
+# note: choose a database
+#test_database_dsn: dbi:mysql:dbname=webwork3_test
+
+# Database credentials for mysql or mariadb.
+# These are ignored if the 'sqlite' database is used.
+test_database_user: webworkWrite
+test_database_password: password
+
+# If ignore_permissions is set to true, all routes can be executed.
+# This should only be used in development.
+ignore_permissions: true
+
+

jest.config.js

@@ -0,0 +1,22 @@
+/* eslint-env node */
+
+module.exports = {
+	preset: 'ts-jest',
+	testEnvironment: 'node',
+	globals: {
+		'ts-jest': {
+			'tsconfig': 'tsconfig.json',
+			'diagnostics': true
+		}
+	},
+	moduleNameMapper: {
+		'^src/(.*)$': '<rootDir>/src/$1',
+		'^app/(.*)$': '<rootDir>/$1',
+		'^components/(.*)$': '<rootDir>/src/components/$1',
+		'^layouts/(.*)$': '<rootDir>/src/layouts/$1',
+		'^pages/(.*)$': '<rootDir>/src/pages/$1',
+		'^assets/(.*)$': '<rootDir>/src/assets/$1',
+		'^boot/(.*)$': '<rootDir>/src/boot/$1'
+	},
+	testRegex: '(/tests/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$',
+};

lib/DB/Schema/Result/ProblemSet.pm

@@ -100,15 +100,17 @@ __PACKAGE__->add_columns(
 		default_value => 1,
 		is_nullable   => 0
 	},
-	dates => {    # store dates as a JSON object
+	# store dates as a JSON object
+	set_dates => {
 		data_type          => 'text',
 		size               => 256,
 		is_nullable        => 0,
 		default_value      => '{}',
 		serializer_class   => 'JSON',
 		serializer_options => { utf8 => 1 }
 	},
-	params => {    # store params as a JSON object
+	# store params as a JSON object
+	set_params => {
 		data_type          => 'text',
 		size               => 256,
 		is_nullable        => 0,

lib/DB/Schema/Result/UserSet.pm

@@ -102,15 +102,15 @@ __PACKAGE__->add_columns(
 		is_nullable   => 0,
 		default_value => 1,
 	},
-	dates => {    # store dates as a JSON object
+	set_dates => {    # store dates as a JSON object
 		data_type          => 'text',
 		size               => 256,
 		is_nullable        => 0,
 		default_value      => '{}',
 		serializer_class   => 'JSON',
 		serializer_options => { utf8 => 1 }
 	},
-	params => {    # store params as a JSON object
+	set_params => {    # store params as a JSON object
 		data_type          => 'text',
 		size               => 256,
 		is_nullable        => 0,

lib/DB/Schema/ResultSet/Problem.pm

@@ -3,9 +3,6 @@ use strict;
 use warnings;
 use base 'DBIx::Class::ResultSet';
 
-use Carp;
-use Data::Dump qw/dd dump/;
-
 # use List::Util qw/first/;
 
 use DB::Utils qw/getCourseInfo getSetInfo getProblemInfo/;
@@ -160,8 +157,11 @@ sub addSetProblem {
 	# set the problem number to one more than the set's largest
 	$new_problem_params->{problem_number} = 1 + ($problem_set->problems->get_column('problem_number')->max // 0);
 
-	$self->new($new_problem_params)->validParams();
+	my $problem_to_add = $self->new($new_problem_params);
+	$problem_to_add->validParams(undef, 'params');
+
 	my $added_problem = $problem_set->add_to_problems($new_problem_params);
+	return $as_result_set ? $added_problem : { $added_problem->get_inflated_columns };
 
 	return $as_result_set ? $added_problem : { $added_problem->get_inflated_columns };
 }
@@ -197,10 +197,6 @@ sub deleteSetProblem {
 
 }
 
-# sub addPoolProblem {
-# 	my ( $self, $course_set_info, $new_set_params, $as_result_set ) = @_;
-# }
-
 =head2 deleteSetProblem
 
 This deletes the problem with given course and set

lib/DB/Schema/ResultSet/ProblemPool.pm

@@ -3,9 +3,6 @@ use strict;
 use warnings;
 use base 'DBIx::Class::ResultSet';
 
-use Carp;
-use Data::Dump qw/dd dump/;
-use Scalar::Util qw/reftype/;
 use Try::Tiny;
 
 use DB::Utils qw/getCourseInfo getPoolInfo getPoolProblemInfo/;
@@ -174,8 +171,7 @@ sub deleteProblemPool {
 
 	my $deleted_pool = $pool->delete();
 
-	return $deleted_pool if $as_result_set;
-	return { $deleted_pool->get_columns };
+	return $as_result_set ? $deleted_pool : { $deleted_pool->get_columns };
 }
 
 #####
@@ -227,12 +223,10 @@ sub getPoolProblem {
 	my @pool_problems = $problem_pool->search_related("pool_problems", $pool_problem_info)->all;
 
 	if (scalar(@pool_problems) == 1) {
-		return $pool_problems[0] if $as_result_set;
-		return { $pool_problems[0]->get_columns };
+		return $as_result_set ? $pool_problems[0] : { $pool_problems[0]->get_inflated_columns };
 	} else {     # pick a random problem.
 		my $prob = $pool_problems[ rand @pool_problems ];
-		return $prob if $as_result_set;
-		return { $prob->get_inflated_columns };
+		return $as_result_set ? $prob : { $prob->get_inflated_columns };
 	}
 }
 

lib/DB/Schema/ResultSet/ProblemSet.pm

@@ -5,7 +5,6 @@ use base 'DBIx::Class::ResultSet';
 
 use Carp;
 use Clone qw/clone/;
-use Data::Dump qw/dd dump/;
 
 use DB::Utils qw/getCourseInfo getUserInfo getSetInfo updateAllFields/;
 
@@ -175,12 +174,8 @@ sub addProblemSet {
 		if defined($problem_set);
 	my $set_obj = $self->new($set_params);
 
-	# dd {$set_obj->get_inflated_columns};
-
-	## check the parameters are valid.
-	# $set_obj->setParamsAndDates;
-	$set_obj->validDates();
-	$set_obj->validParams();
+	$set_obj->validDates(undef, 'set_dates');
+	$set_obj->validParams(undef, 'set_params');
 
 	my $new_set = $course->add_to_problem_sets($set_params, 1);
 
@@ -212,8 +207,8 @@ sub updateProblemSet {
 	my $set_obj = $self->new($params2);
 
 	## check the parameters are valid.
-	$set_obj->validDates();
-	$set_obj->validParams();
+	$set_obj->validDates(undef, 'set_dates');
+	$set_obj->validParams(undef, 'set_params');
 	my $updated_set = $problem_set->update({ $set_obj->get_inflated_columns });
 	return $updated_set if $as_result_set;
 	my $set = { $updated_set->get_inflated_columns, set_type => $updated_set->set_type };