Adds module to update character.

4 files changed, 241 insertions, 3 deletions

diff --git a/conf/yaws.conf.m4 b/conf/yaws.conf.m4
index 3098bf8..d3c9578 100644
--- a/conf/yaws.conf.m4
+++ b/conf/yaws.conf.m4
@@ -110,6 +110,6 @@ keepalive_timeout = 30000
   listen = 0.0.0.0
   docroot = __MAKEFILE_WWW_DIR
   auth_log = true
-  appmods = btl_character_turn btl_load map_load map_update lgn_sign_in lgn_sign_up lgn_recovery
+  appmods = btl_character_turn btl_load map_load map_update lgn_sign_in lgn_sign_up lgn_recovery chr_load chr_update
   start_mod = qry_handler
 </server>
diff --git a/src/character/query/chr_update.erl b/src/character/query/chr_update.erl
new file mode 100644
index 0000000..adac09a
--- /dev/null
+++ b/src/character/query/chr_update.erl
@@ -0,0 +1,150 @@
+-module(chr_update).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-include("../../../include/yaws_api.hrl").
+
+-record
+(
+   input,
+   {
+      player_id :: binary(),
+      session_token :: binary(),
+      character_ix :: non_neg_integer(),
+      character :: chr_character:type()
+   }
+).
+
+-record
+(
+   query_state,
+   {
+      player :: shr_player:type(),
+      inventory :: shr_inventory:type(),
+      roster :: chr_roster:type()
+   }
+).
+
+-type input() :: #input{}.
+-type query_state() :: #query_state{}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-export([out/1]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-spec parse_input (binary()) -> input().
+parse_input (Req) ->
+   JSONReqMap = jiffy:decode(Req, [return_maps]),
+   PlayerID = maps:get(<<"pid">>, JSONReqMap),
+   SessionToken =  maps:get(<<"stk">>, JSONReqMap),
+   CharacterIX = maps:get(<<"cix">>, JSONReqMap),
+   EncodedCharacter = maps:get(<<"chr">>, JSONReqMap),
+
+   Character = chr_character:decode(EncodedCharacter),
+
+   #input
+   {
+      player_id = PlayerID,
+      session_token = SessionToken,
+      character_ix = CharacterIX,
+      character = Character
+   }.
+
+-spec authenticate_user (input()) -> {'ok', shr_player:type()}.
+authenticate_user (Input) ->
+   PlayerID = Input#input.player_id,
+   SessionToken = Input#input.session_token,
+
+   Player = shr_timed_cache:fetch(player_db, any, PlayerID),
+
+   shr_security:assert_identity(SessionToken, Player),
+
+   {ok, Player}.
+
+-spec fetch_data (shr_player:type(), input()) -> query_state().
+fetch_data (Player, Input) ->
+   PlayerID = Input#input.player_id,
+   RosterID = shr_player:get_roster_id(Player),
+   InventoryID = shr_player:get_inventory_id(Player),
+
+   Roster = shr_timed_cache:fetch(char_roster_db, PlayerID, RosterID),
+   Inventory = shr_timed_cache:fetch(char_roster_db, PlayerID, InventoryID),
+
+   #query_state
+   {
+      player = Player,
+      roster = Roster,
+      inventory = Inventory
+   }.
+
+-spec update_data (query_state(), input()) -> query_state().
+update_data (QueryState, Input) ->
+   Inventory = QueryState#query_state.inventory,
+   Character = Input#input.character,
+
+   chr_character:validate(Inventory, Character),
+
+   %% TODO
+   QueryState.
+
+-spec commit_update (query_state(), input()) -> 'ok'.
+commit_update (QueryState, Input) ->
+   PlayerID = Input#input.player_id,
+   CharacterIX = Input#input.character_ix,
+   Character = Input#input.character,
+   Player = QueryState#query_state.player,
+   Roster = QueryState#query_state.roster,
+
+   RosterID = shr_player:get_roster_id(Player),
+   UpdatedRoster = chr_roster:set_character(CharacterIX, Character, Roster),
+
+   Query =
+      shr_db_query:new
+      (
+         char_roster_db,
+         RosterID,
+         {user, PlayerID},
+         [
+            shr_db_query:update_indexed
+            (
+               chr_roster:get_characters_field(),
+               CharacterIX,
+               [shr_db_query:set_value(Character)]
+            )
+         ]
+      ),
+
+   shr_database:commit(Query),
+   shr_timed_cache:update(char_roster_db, PlayerID, RosterID, UpdatedRoster),
+
+   'ok'.
+
+-spec generate_reply () -> binary().
+generate_reply () ->
+   jiffy:encode([shr_okay:generate()]).
+
+-spec handle (binary()) -> binary().
+handle (Req) ->
+   Input = parse_input(Req),
+   {ok, Player} = authenticate_user(Input),
+   shr_security:lock_queries(Input#input.player_id),
+   QueryState = fetch_data(Player, Input),
+   Update = update_data(QueryState, Input),
+   commit_update(Update, Input),
+   shr_security:unlock_queries(Input#input.player_id),
+   generate_reply().
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+out(A) ->
+   {
+      content,
+      "application/json; charset=UTF-8",
+      handle(A#arg.clidata)
+   }.
diff --git a/src/character/struct/chr_character.erl b/src/character/struct/chr_character.erl
index a9ef52d..80b9bcd 100644
--- a/src/character/struct/chr_character.erl
+++ b/src/character/struct/chr_character.erl
@@ -52,13 +52,65 @@
 -export
 (
    [
+      decode/1,
       random/0
    ]
 ).
 
+-export
+(
+   [
+      validate/2
+   ]
+).
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-spec validate_name (binary()) -> ok.
+validate_name (_Name) ->
+   % TODO: unimplemented
+   ok.
+
+-spec validate_portrait (shr_inventory:type(), binary()) -> ok.
+validate_portrait (_Inventory, _Portrait) ->
+   % TODO: unimplemented
+   ok.
+
+-spec validate_weapons
+   (
+      shr_inventory:type(),
+      {shr_weapon:id(), shr_weapon:id()}
+   )
+   -> ok.
+validate_weapons (_Inventory, {_ActiveWeapon, _SecondaryWeapon}) ->
+   % TODO: unimplemented
+   ok.
+
+-spec validate_armor (shr_inventory:type(), shr_armor:id()) -> ok.
+validate_armor (_Inventory, _Armor) ->
+   % TODO: unimplemented
+   ok.
+
+-spec validate_glyphs (shr_inventory:type(), array:array(shr_glyph:id())) -> ok.
+validate_glyphs (_Inventory, _Glyphs) ->
+   % TODO: unimplemented
+   ok.
+
+-spec validate_glyph_board (shr_inventory:type(), shr_glyph_board:id()) -> ok.
+validate_glyph_board (_Inventory, _GlyphBoard) ->
+   % TODO: unimplemented
+   ok.
+
+-spec validate_glyphs_on_board
+   (
+      array:array(shr_glyph:id()),
+      shr_glyph_board:id()
+   )
+   -> ok.
+validate_glyphs_on_board (_Glyphs, _GlyphBoard) ->
+   % TODO: unimplemented
+   ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -149,3 +201,38 @@ get_weapon_ids_field () -> #character.weapon_ids.
 get_glyph_ids_field () -> #character.glyph_ids.
 -spec get_glyph_board_id_field () -> non_neg_integer().
 get_glyph_board_id_field () -> #character.glyph_board_id.
+
+-spec decode (map()) -> type().
+decode (JSONReqMap) ->
+   Name = maps:get(<<"nam">>, JSONReqMap),
+   Portrait = maps:get(<<"prt">>, JSONReqMap),
+   ActiveWeapon = maps:get(<<"awp">>, JSONReqMap),
+   SecondaryWeapon = maps:get(<<"swp">>, JSONReqMap),
+   Armor = maps:get(<<"ar">>, JSONReqMap),
+   GlyphsList = maps:get(<<"gls">>, JSONReqMap),
+   GlyphBoard = maps:get(<<"gb">>, JSONReqMap),
+
+   #character
+   {
+      name = Name,
+      portrait = Portrait,
+      weapon_ids = {ActiveWeapon, SecondaryWeapon},
+      armor_id = Armor,
+      glyph_ids = array:from_list(GlyphsList),
+      glyph_board_id = GlyphBoard
+   }.
+
+-spec validate (shr_inventory:type(), type()) -> ok.
+validate (Inventory, Character) ->
+   Glyphs = Character#character.glyph_ids,
+   GlyphBoard = Character#character.glyph_board_id,
+
+   validate_name(Character#character.name),
+   validate_portrait(Inventory, Character#character.portrait),
+   validate_weapons(Inventory, Character#character.weapon_ids),
+   validate_armor(Inventory, Character#character.armor_id),
+   validate_glyphs(Inventory, Glyphs),
+   validate_glyph_board(Inventory, GlyphBoard),
+   validate_glyphs_on_board(Glyphs, GlyphBoard),
+
+   ok.
diff --git a/src/shared/struct/shr_db_query.erl b/src/shared/struct/shr_db_query.erl
index 5310f00..8cd7b8a 100644
--- a/src/shared/struct/shr_db_query.erl
+++ b/src/shared/struct/shr_db_query.erl
@@ -67,9 +67,10 @@
    }
 ).
 
--type db_query_op() :: (#set_field{} | #add_to_field{} | #update_indexed{}).
+-type db_query_op() ::
+   (#set_field{} | #add_to_field{} | #update_indexed{} | #set_val{}).
 -type db_query_master_op() ::
-   (db_query_op() | #set_read_perm{} | #set_write_perm{} | #set_val{}).
+   (db_query_op() | #set_read_perm{} | #set_write_perm{}).
 
 -type db_query() :: #db_query{}.