Assessments #34

sreycodes · 2018-05-20T09:17:20Z

indocomsoft · 2018-05-20T09:22:53Z

lib/cadet/submission_status.ex

@@ -0,0 +1,5 @@
+import EctoEnum


I think this is a duplicate file, should be located in lib/cadet/assessments/ instead

indocomsoft · 2018-05-20T09:33:34Z

lib/cadet/assessments/Assessment.ex

@@ -0,0 +1,29 @@
+defmodule Cadet.Assessments.Assessment do


I don't think we need assessment entity since all this does is has_one :mission, Mission, is redundant.

indocomsoft

Hey, I added some more comments.

indocomsoft · 2018-05-23T16:08:31Z

lib/cadet/assessments/Question.ex

+    field :title, :string
+    field :display_order, :integer
+    field :weight, :integer
+    field :question_json, :map


Following the convention in source-academy, I think the field name should be :question

indocomsoft · 2018-05-23T16:08:52Z

lib/cadet/assessments/Question.ex

+    field :weight, :integer
+    field :question_json, :map
+    field :type, ProblemType
+    field :raw_json, :string, virtual: true


And similarly this shuld be :raw_question

indocomsoft · 2018-05-23T16:09:38Z

lib/cadet/assessments/Question.ex

+    |> put_json
+  end
+
+  defp put_json(changeset) do


Similarly, this should be put_question

indocomsoft · 2018-05-23T16:09:48Z

lib/cadet/assessments/answer.ex

+
+  schema "answers" do
+    field :marks, :float, default: 0.0
+    field :answer_json, :map


Same thing here

indocomsoft · 2018-05-23T16:09:53Z

lib/cadet/assessments/answer.ex

+    field :marks, :float, default: 0.0
+    field :answer_json, :map
+    field :type, ProblemType
+    field :raw_json, :string, virtual: true


indocomsoft · 2018-05-23T16:12:18Z

lib/cadet/assessments/mission.ex

  end

-  @required_fields ~w(order category title open_at close_at)a
-  @optional_fields ~w(summary_short summary_long)
+  @required_fields ~w(name order category title open_at close_at library)a


Don't forget to remove from here too

indocomsoft · 2018-05-23T16:12:23Z

lib/cadet/assessments/mission.ex

-  @required_fields ~w(order category title open_at close_at)a
-  @optional_fields ~w(summary_short summary_long)
+  @required_fields ~w(name order category title open_at close_at library)a
+  @optional_fields ~w(summary_short summary_long is_published max_xp priority raw_library)a


indocomsoft · 2018-05-23T16:13:39Z

lib/cadet/assessments/problem_type.ex

@@ -0,0 +1,5 @@
+import EctoEnum
+
+defenum Cadet.Assessments.ProblemType, :type, [


For consistency The enum should be named QuestionType since it is the type of Question

Enum must be used for question and answer I think

Fair enough

indocomsoft · 2018-05-23T16:16:32Z

lib/cadet/assessments/submission.ex

+  end
+
+  def validate_role(changeset, user, role) do
+    validate_change(changeset, user, fn _, user ->


should be fn ^user, user although I think you may want to reconsider the variable names

indocomsoft · 2018-05-23T16:17:00Z

lib/cadet/submission_status.ex

@@ -0,0 +1,5 @@
+import EctoEnum


indocomsoft

Do plan out with swagger first before writing your controller, I think that way the code we produce will be of higher quality. Also as much as possible run mix format, mix test and mix credo and fix any problem before pushing. Generally a good idea

indocomsoft · 2018-05-24T13:15:02Z

lib/cadet_web/controllers/assessments_controller.ex

+
+  alias Cadet.Assessments
+
+  @tabs_map %{


Why do we have tabs?

indocomsoft · 2018-05-24T13:15:30Z

lib/cadet_web/controllers/assessments_controller.ex

@@ -0,0 +1,77 @@
+defmodule CadetWeb.AssessmentController do


Please write swagger specification so I can review your code better :)

indocomsoft · 2018-05-24T13:16:29Z

lib/cadet_web/controllers/question_controller.ex

+    Assessments.update_question(params["id"], params["question"])
+  end
+
+  def delete(conn, %{"mission_id" => mission_id, "id" => id}) do


Unclosed def

coveralls · 2018-05-26T01:14:52Z

Pull Request Test Coverage Report for Build 486

74 of 75 (98.67%) changed or added relevant lines in 11 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage increased (+3.3%) to 97.818%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
lib/cadet/assessments/submission.ex	4	5	80.0%

Totals
Change from base Build 444:	3.3%
Covered Lines:	269
Relevant Lines:	275

💛 - Coveralls

* Improve contexts - Allow using multiple contexts - Cleaned up some imports in /lib/cadet/accessments * Raise exception when using context with invalid arguments * More housecleaning * Add comment to cadet context

indocomsoft · 2018-06-23T14:48:33Z

@tuesmiddt I feel this should be ready to merge, but since I made the edits, I think it's good that you have a lookthrough. If everything is alright, I'll merge this tomorrow.

tuesmiddt · 2018-06-24T08:43:23Z

lib/cadet/assessments/assessments.ex

+  def all_open_assessments(category) do
+    now = Timex.now()
+
+    assessment_with_category = Repo.all(from(a in Assessment, where: a.category == ^category))


Can use the all_assessments(category) method above but I think just leave it for now.

In general I think we should combine this and the Enum.filter below into one query string so that the DB engine only gives us the results we want instead of fetching too much data into memory and then filtering it. Can leave that for a later refactor.

Good point. I'll write it down as a TODO

tuesmiddt · 2018-06-24T08:55:01Z

lib/cadet/assessments/assessments.ex

+  end
+
+  def create_assessment(params) do
+    changeset = build_assessment(params)


Use pipeline syntax

https://github.com/lexmag/elixir-style-guide#needless-pipeline
Basically for single function call, don't use pipeline syntax.

i was thinking of

params |> build_assessment() |> Repo.insert()

Ohh makes sense

tuesmiddt · 2018-06-24T08:55:27Z

lib/cadet/assessments/assessments.ex

+  end
+
+  def publish_assessment(id) do
+    assessment = get_assessment(id)


Use pipeline syntax

idem https://github.com/lexmag/elixir-style-guide#needless-pipeline

how about

id |> get_assessment() |> change(%{is_published: true}) |> Repo.update()

tuesmiddt · 2018-06-24T09:00:13Z

lib/cadet/assessments/assessments.ex

+    Repo.get(Assessment, id)
+  end
+
+  def create_question(params, assessment_id) do


I think can combine this with create_question_for_assessment

tuesmiddt · 2018-06-24T09:24:45Z

lib/cadet/assessments/question.ex

+  end
+
+  defp put_question(changeset) do
+    {:ok, json} = Poison.decode(get_change(changeset, :raw_question) || "{}")


I think this is clearer if we split it into two lines or do this instead:

{:ok, json} = changeset |> get_change(:raw_question) |> Kernel.||("{}") |> Poison.decode()

* Added Question and Assessment * Added functionality for grading * Added assessments functionality * Fixed typo * Restructured assessments * Added assessments context * Added controllers * Delete duplicate file * Changes to suit convention * Fixed stuff * Ran mix commands * Fix changes * Removed role validation * Removed all compile time errors * Fixed consistency issues * Refactored * Conversion to spaces * More functionality for questions * Adding tests * Refactored * Added few tests for missions * Few more tests to go * Added more tests * Delete useless migration * Delete useless migration 2 * Added submission test * Added question tests and switched controllers to new branch * Added answers test * Remove unneccesary stuff * Formatting * Fixed compile error * Make changes according to review * Fixes * Added tests to question and answer * Added question types * Various fixes * Changes according to question types * Assessments context * Fixes * Removed invalid test * Fix some tests * Assessments housecleaning (#51) * Improve contexts - Allow using multiple contexts - Cleaned up some imports in /lib/cadet/accessments * Raise exception when using context with invalid arguments * More housecleaning * Add comment to cadet context * Fix credo * Remove duplicate blank line * Remove pre-commit * Refactor json and rename Mission to Assessment * Fix submission model * Use cadet context * Fix some json tests * Fix tests and logic error * Remove untested method and add one test * Remove useless import * Add test * Fix according to code review * Change to pipeline syntax * Reorganise file

sreycodes added 4 commits May 20, 2018 10:36

Added Question and Assessment

a87b621

Added functionality for grading

971641d

Added assessments functionality

5ca0341

Fixed typo

f2a81cc

indocomsoft added this to To do in Sprint 1 via automation May 20, 2018

indocomsoft added this to the Sprint 1 milestone May 20, 2018

indocomsoft moved this from To do to In Progress in Sprint 1 May 20, 2018

sreycodes self-assigned this May 20, 2018

indocomsoft reviewed May 20, 2018

View reviewed changes

sreycodes and others added 2 commits May 20, 2018 22:42

Restructured assessments

948abc7

Added assessments context

b030281

indocomsoft moved this from In Progress to Under Review in Sprint 1 May 23, 2018

indocomsoft moved this from Under Review to In Progress in Sprint 1 May 23, 2018

indocomsoft reviewed May 23, 2018

View reviewed changes

Sipani and others added 3 commits May 24, 2018 19:12

Added controllers

20a25a5

Delete duplicate file

ed5ca63

Changes to suit convention

4319fc9

indocomsoft reviewed May 24, 2018

View reviewed changes

sreycodes and others added 10 commits May 25, 2018 00:01

Fixed stuff

b865a25

Ran mix commands

b15aba4

Small fixes

a185c5e

Fix changes

16df491

Removed role validation

b6e06cd

Removed all compile time errors

21168b9

Fixed consistency issues

1d3de81

Refactored

f6c265d

Conversion to spaces

7520e5b

Merge branch 'master' into assessments

e9d1e57

More functionality for questions

70b9bcf

tuesmiddt and others added 10 commits June 18, 2018 21:33

Assessments housecleaning (#51)

843bfa6

* Improve contexts - Allow using multiple contexts - Cleaned up some imports in /lib/cadet/accessments * Raise exception when using context with invalid arguments * More housecleaning * Add comment to cadet context

Merge branch 'master' into assessments

d466842

Fix credo

5f49622

Remove duplicate blank line

bb91e3d

Remove pre-commit

60e9cb6

Refactor json and rename Mission to Assessment

5d7d9f7

Merge branch 'master' into assessments

ef3c47d

Fix submission model

9451e3f

Use cadet context

8518c0f

Fix some json tests

988b205

indocomsoft force-pushed the assessments branch from a776bfe to 988b205 Compare June 23, 2018 12:17

indocomsoft added 3 commits June 23, 2018 22:09

Fix tests and logic error

8c79b7a

Remove untested method and add one test

f222fbc

Remove useless import

c28e0b7

indocomsoft requested a review from tuesmiddt June 23, 2018 14:29

Add test

8783065

tuesmiddt reviewed Jun 24, 2018

View reviewed changes

indocomsoft added 3 commits June 25, 2018 00:02

Fix according to code review

b6d1bfe

Change to pipeline syntax

a6b45e4

Reorganise file

14e5ac3

indocomsoft approved these changes Jun 24, 2018

View reviewed changes

indocomsoft merged commit cb56954 into master Jun 24, 2018

Sprint 3 automation moved this from In progress to Done Jun 24, 2018

indocomsoft deleted the assessments branch June 24, 2018 16:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Assessments #34

Assessments #34

sreycodes commented May 20, 2018 •

edited by indocomsoft

indocomsoft May 20, 2018

indocomsoft May 23, 2018

indocomsoft May 20, 2018

indocomsoft left a comment

indocomsoft May 23, 2018

indocomsoft May 23, 2018

indocomsoft May 23, 2018

indocomsoft May 23, 2018

indocomsoft May 23, 2018

indocomsoft May 23, 2018

indocomsoft May 23, 2018

indocomsoft May 23, 2018

sreycodes May 24, 2018

indocomsoft May 24, 2018

indocomsoft May 23, 2018

indocomsoft May 23, 2018

indocomsoft left a comment

indocomsoft May 24, 2018

indocomsoft May 24, 2018

indocomsoft May 24, 2018

coveralls commented May 26, 2018 •

edited

indocomsoft commented Jun 23, 2018

tuesmiddt Jun 24, 2018 •

edited

indocomsoft Jun 24, 2018

indocomsoft Jun 24, 2018

tuesmiddt Jun 24, 2018

indocomsoft Jun 24, 2018

tuesmiddt Jun 24, 2018

indocomsoft Jun 24, 2018

tuesmiddt Jun 24, 2018

indocomsoft Jun 24, 2018

tuesmiddt Jun 24, 2018

tuesmiddt Jun 24, 2018

tuesmiddt Jun 24, 2018

		@@ -0,0 +1,5 @@
		import EctoEnum

		defenum Cadet.Assessments.ProblemType, :type, [

Assessments #34

Assessments #34

Conversation

sreycodes commented May 20, 2018 • edited by indocomsoft

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

indocomsoft left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

indocomsoft left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented May 26, 2018 • edited

Pull Request Test Coverage Report for Build 486

💛 - Coveralls

indocomsoft commented Jun 23, 2018

tuesmiddt Jun 24, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sreycodes commented May 20, 2018 •

edited by indocomsoft

coveralls commented May 26, 2018 •

edited

tuesmiddt Jun 24, 2018 •

edited