Merge branch 'master' into v2

Author: qreoct

lib/cadet_web/admin_controllers/admin_achievements_controller.ex

@@ -31,13 +31,18 @@ defmodule CadetWeb.AdminAchievementsController do
       |> snake_casify_string_keys_recursive()
       |> rename_keys([
         {"deadline", "close_at"},
-        {"release", "open_at"}
+        {"release", "open_at"},
+        {"card_background", "card_tile_url"}
       ])
       |> case do
         map = %{"view" => view} ->
           map
           |> Map.delete("view")
-          |> Map.merge(view |> Map.take(~w(canvas_url description completion_text)))
+          |> Map.merge(
+            view
+            |> rename_keys([{"cover_image", "canvas_url"}])
+            |> Map.take(~w(canvas_url description completion_text))
+          )
 
         map ->
           map

lib/cadet_web/admin_controllers/admin_goals_controller.ex

@@ -30,12 +30,12 @@ defmodule CadetWeb.AdminGoalsController do
   end
 
   defp json_to_goal(json, uuid \\ nil) do
+    original_meta = json["meta"]
+
     json =
       json
       |> snake_casify_string_keys_recursive()
-      |> rename_keys([
-        {"max_exp", "max_xp"}
-      ])
+      |> Map.put("meta", original_meta)
 
     if is_nil(uuid) do
       json

lib/cadet_web/admin_views/admin_goals_view.ex

@@ -10,7 +10,7 @@ defmodule CadetWeb.AdminGoalsView do
     transform_map_for_view(goal, %{
       uuid: :uuid,
       text: :text,
-      maxExp: :max_xp,
+      maxXp: :max_xp,
       type: :type,
       meta: :meta
     })

lib/cadet_web/controllers/incentives_controller.ex

@@ -58,7 +58,7 @@ defmodule CadetWeb.IncentivesController do
               "Achievement ability i.e. category"
             )
 
-            cardTileUrl(
+            cardBackground(
               :string,
               "URL of the achievement's background image"
             )
@@ -104,7 +104,7 @@ defmodule CadetWeb.IncentivesController do
           description("Achievement view properties")
 
           properties do
-            canvasUrl(
+            coverImage(
               :string,
               "URL of the image for the view"
             )
@@ -136,7 +136,7 @@ defmodule CadetWeb.IncentivesController do
               "Text to show when goal is completed"
             )
 
-            maxExp(
+            maxXp(
               :integer,
               "Total EXP for this goal"
             )
@@ -173,12 +173,12 @@ defmodule CadetWeb.IncentivesController do
               "Text to show when goal is completed"
             )
 
-            exp(
+            xp(
               :integer,
               "EXP currently attained by the user for this goal"
             )
 
-            maxExp(
+            maxXp(
               :integer,
               "Total EXP for this goal"
             )

lib/cadet_web/views/incentives_view.ex

@@ -14,17 +14,17 @@ defmodule CadetWeb.IncentivesView do
       release: &format_datetime(&1.open_at),
       deadline: &format_datetime(&1.close_at),
       isTask: :is_task,
-      prerequisiteIds:
-        &Enum.map(&1.prerequisites, fn prerequisite -> prerequisite.prerequisite_id end),
-      cardTileUrl: :card_tile_url,
+      prerequisiteUuids:
+        &Enum.map(&1.prerequisites, fn prerequisite -> prerequisite.prerequisite_uuid end),
+      cardBackground: :card_tile_url,
       position: :position,
       view:
         &%{
-          canvasUrl: &1.canvas_url,
+          coverImage: &1.canvas_url,
           description: &1.description,
           completionText: &1.completion_text
         },
-      goalUuids: &Enum.map(&1.goals, fn goal -> goal.uuid end)
+      goalUuids: &Enum.map(&1.goals, fn goal -> goal.goal_uuid end)
     })
   end
 
@@ -36,15 +36,15 @@ defmodule CadetWeb.IncentivesView do
     transform_map_for_view(goal, %{
       uuid: :uuid,
       text: :text,
-      exp: fn
+      xp: fn
         %{progress: [%{xp: xp}]} -> xp
         _ -> 0
       end,
       completed: fn
         %{progress: [%{completed: completed}]} -> completed
         _ -> false
       end,
-      maxExp: :max_xp,
+      maxXp: :max_xp,
       type: :type,
       meta: :meta
     })

mix.exs

@@ -57,6 +57,7 @@ defmodule Cadet.Mixfile do
       {:ex_aws_s3, "~> 2.0"},
       {:ex_aws_secretsmanager, "~> 2.0"},
       {:ex_aws_sts, "~> 2.1"},
+      {:ex_json_schema, "~> 0.7.4"},
       {:ex_machina, "~> 2.3"},
       {:guardian, "~> 2.0"},
       {:guardian_db, "~> 2.0"},

mix.lock

@@ -55,7 +55,7 @@ defmodule CadetWeb.IncentivesControllerTest do
       [resp_goal] = conn |> get("/v1/self/goals") |> json_response(200)
 
       assert goal_json_literal(0) = resp_goal
-      assert resp_goal["exp"] == progress.xp
+      assert resp_goal["xp"] == progress.xp
       assert resp_goal["completed"] == progress.completed
     end
 

test/cadet_web/controllers/incentives_controller_test.exs

@@ -14,7 +14,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/source-academy-assets/"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/source-academy-assets"
     },
     "response": {
       "binary": false,
@@ -30,4 +30,4 @@
       "type": "ok"
     }
   }
-]
+]

test/fixtures/vcr_cassettes/aws/controller_list_assets#1.json

@@ -14,7 +14,7 @@
         "recv_timeout": 660000
       },
       "request_body": "",
-      "url": "https://s3.ap-southeast-1.amazonaws.com/source-academy-assets/"
+      "url": "https://s3.ap-southeast-1.amazonaws.com/source-academy-assets"
     },
     "response": {
       "binary": false,

test/fixtures/vcr_cassettes/aws/model_list_assets#1.json

@@ -21,10 +21,10 @@ defmodule Cadet.TestEntityHelper do
       "ability" => "Core",
       "position" => id,
       "title" => "Achievement #{id}",
-      "cardTileUrl" => "http://hello#{id}",
+      "cardBackground" => "http://hello#{id}",
       "isTask" => false,
       "view" => %{
-        "canvasUrl" => "http://bye#{id}",
+        "coverImage" => "http://bye#{id}",
         "completionText" => "Done #{id}",
         "description" => "Test #{id}"
       }
@@ -42,7 +42,7 @@ defmodule Cadet.TestEntityHelper do
 
   defmacro goal_json_literal(id) do
     Macro.escape(%{
-      "maxExp" => id,
+      "maxXp" => id,
       "meta" => %{"id" => id},
       "text" => "Sample #{id}",
       "type" => "type_#{id}"