[BROKEN] Still converting to Ataxia...

5 files changed, 102 insertions, 62 deletions

diff --git a/src/battle/struct/btl_character_turn_update.erl b/src/battle/struct/btl_character_turn_update.erl
index d63e437..85152b0 100644
--- a/src/battle/struct/btl_character_turn_update.erl
+++ b/src/battle/struct/btl_character_turn_update.erl
@@ -9,7 +9,7 @@
    {
       data :: btl_character_turn_data:type(),
       timeline :: list(any()),
-      db :: list(shr_db_query:op())
+      db :: list(ataxic:basic())
    }
 ).
 
@@ -57,7 +57,7 @@ get_data (Update) -> Update#type.data.
 -spec get_timeline (type()) -> list(any()).
 get_timeline (Update) -> Update#type.timeline.
 
--spec get_db (type()) -> list(shr_db_query:op()).
+-spec get_db (type()) -> list(ataxic:basic()).
 get_db (Update) -> Update#type.db.
 
 -spec set_data (btl_character_turn_data:type(), type()) -> type().
@@ -67,7 +67,7 @@ set_data (Data, Update) ->
 -spec add_to_timeline
    (
       btl_turn_result:type(),
-      shr_db_query:op(),
+      ataxic:basic(),
       type()
    ) -> type().
 add_to_timeline (Item, DBUpdate, Update) ->
@@ -80,6 +80,6 @@ add_to_timeline (Item, DBUpdate, Update) ->
       }
    ).
 
--spec add_to_db (shr_db_query:op(), type()) -> type().
+-spec add_to_db (ataxic:basic(), type()) -> type().
 add_to_db (Item, Update) ->
    Update#type{ db = [Item|Update#type.db] }.
diff --git a/src/login/query/lgn_sign_in.erl b/src/login/query/lgn_sign_in.erl
index 662e273..357ed65 100644
--- a/src/login/query/lgn_sign_in.erl
+++ b/src/login/query/lgn_sign_in.erl
@@ -83,27 +83,31 @@ commit_update (QueryState) ->
    NewToken = shr_player:get_token(UpdatedPlayer),
    NewActiveTime = shr_player:get_last_active(UpdatedPlayer),
 
-   Query =
-      shr_db_query:new
+   ok =
+      ataxia_client:update
       (
          player_db,
-         PlayerID,
-         {user, PlayerID},
-         [
-            shr_db_query:set_field
+         ataxia_security:user_from_id(PlayerID),
+         ataxic:value
+         (
+            ataxic:sequence
             (
-               shr_player:get_token_field(),
-               NewToken
-            ),
-            shr_db_query:set_field
-            (
-               shr_player:get_last_active_field(),
-               NewActiveTime
+               [
+                  ataxic:on_field
+                  (
+                     shr_player:get_token_field(),
+                     ataxic:constant(NewToken)
+                  ),
+                  ataxic:on_field
+                  (
+                     shr_player:get_last_active_field(),
+                     ataxic:constant(NewActiveTime)
+                  )
+               ]
             )
-         ]
+         )
       ),
 
-   ok = shr_database:commit(Query),
    shr_timed_cache:update(player_db, any, PlayerID, UpdatedPlayer),
 
    'ok'.
diff --git a/src/map/query/map_update.erl b/src/map/query/map_update.erl
index 49ed1de..ac4499b 100644
--- a/src/map/query/map_update.erl
+++ b/src/map/query/map_update.erl
@@ -115,32 +115,36 @@ commit_update (QueryState, Input) ->
    MapID = Input#input.map_id,
    Map = QueryState#query_state.map,
 
-   Query =
-      shr_db_query:new
+   ok =
+      ataxia_client:commit
       (
          map_db,
-         MapID,
-         {user, PlayerID},
-         [
-            shr_db_query:set_field
-            (
-               map_map:get_height_field(),
-               Input#input.h
-            ),
-            shr_db_query:set_field
-            (
-               map_map:get_width_field(),
-               Input#input.w
-            ),
-            shr_db_query:set_field
+         ataxia_security:user_from_id(PlayerID),
+         ataxic:value
+         (
+            ataxic:sequence
             (
-               map_map:get_tile_instances_field(),
-               map_map:get_tile_instances(Map)
+               [
+                  ataxic:on_field
+                  (
+                     map_map:get_height_field(),
+                     ataxic:constant(Input#input.h)
+                  ),
+                  ataxic:on_field
+                  (
+                     map_map:get_width_field(),
+                     ataxic:constant(Input#input.w)
+                  ),
+                  ataxic:on_field
+                  (
+                     map_map:get_tile_instances_field(),
+                     ataxic:constant(map_map:get_tile_instances(Map))
+                  )
+               ]
             )
-         ]
+         )
       ),
 
-   shr_database:commit(Query),
    shr_timed_cache:update(map_db, PlayerID, MapID, Map),
 
    'ok'.
diff --git a/src/special/spe_map.erl b/src/special/spe_map.erl
index 94075d9..00b0fde 100644
--- a/src/special/spe_map.erl
+++ b/src/special/spe_map.erl
@@ -32,14 +32,17 @@ grant_additional (OwnerID) ->
    MapSummary = shr_map_summary:new(MapID, <<"Untitled Map">>),
 
    PlayerUpdateQueryOp =
-      ataxic:on_field
+      ataxic:value
       (
-         shr_player:get_map_summaries_field(),
-         ataxic:apply_function
+         ataxic:on_field
          (
-            lists,
-            append,
-            [ataxic:constant([MapSummary]), ataxic:current_value()]
+            shr_player:get_map_summaries_field(),
+            ataxic:apply_function
+            (
+               lists,
+               append,
+               [ataxic:constant([MapSummary]), ataxic:current_value()]
+            )
          )
       ),
 
diff --git a/src/special/spe_player.erl b/src/special/spe_player.erl
index 0b7a6b8..4c6f601 100644
--- a/src/special/spe_player.erl
+++ b/src/special/spe_player.erl
@@ -32,13 +32,13 @@ finalize_login (UsernameLC, EmailLC, PlayerID) ->
             ataxic:read_permission(ataxic:constant(ataxia_security:any())),
             ataxic:write_permission
             (
-               ataxic:constant([ataxia_security:user(PlayerID)])
+               ataxic:constant([ataxia_security:user_from_id(PlayerID)])
             )
          ]
       ),
 
    ok =
-      ataxia_client:commit
+      ataxia_client:update
       (
          login_db,
          ataxia_security:janitor(),
@@ -47,7 +47,7 @@ finalize_login (UsernameLC, EmailLC, PlayerID) ->
       ),
 
    ok =
-      ataxia_client:commit
+      ataxia_client:update
       (
          login_db,
          ataxia_security:janitor(),
@@ -62,11 +62,11 @@ generate_inventory (PlayerID) ->
    Inventory = shr_inventory:new(PlayerID),
 
    {ok, InventoryID} =
-      ataxia_client:insert
+      ataxia_client:add
       (
          inventory_db,
          ataxia_security:any(),
-         [ataxia_security:user(PlayerID)],
+         [ataxia_security:user_from_id(PlayerID)],
          Inventory
       ),
 
@@ -76,11 +76,11 @@ generate_inventory (PlayerID) ->
 generate_roster (PlayerID) ->
    Roster = rst_roster:new(PlayerID),
    {ok, RosterID} =
-      ataxia_client:insert
+      ataxia_client:add
       (
          roster_db,
          ataxia_security:any(),
-         [ataxia_security:user(PlayerID)],
+         [ataxia_security:user_from_id(PlayerID)],
          Roster
       ),
 
@@ -99,7 +99,7 @@ generate (Username, Password, Email) ->
    Player = shr_player:new(<<"">>, Username, Password, Email),
 
    {ok, PlayerID} =
-      ataxia_client:insert
+      ataxia_client:add
       (
          player_db,
          ataxia_security:janitor(),
@@ -113,20 +113,49 @@ generate (Username, Password, Email) ->
    RosterID = generate_roster(PlayerID),
 
    PlayerUpdateQueryOps =
-      [
-         shr_db_query:set_field(shr_player:get_id_field(), PlayerID),
-         shr_db_query:set_field(shr_player:get_inventory_id_field(), InvID),
-         shr_db_query:set_field(shr_player:get_roster_id_field(), RosterID),
-         shr_db_query:set_read_permission(any),
-         shr_db_query:set_write_permission([{user, PlayerID}])
-      ],
+      ataxic:sequence_meta
+      (
+         [
+            ataxic:value
+            (
+               ataxic:sequence
+               (
+                  [
+                     ataxic:on_field
+                     (
+                        shr_player:get_id_field(),
+                        ataxic:constant(PlayerID)
+                     ),
+                     ataxic:on_field
+                     (
+                        shr_player:get_inventory_id_field(),
+                        ataxic:constant(InvID)
+                     ),
+                     ataxic:on_field
+                     (
+                        shr_player:get_roster_id_field(),
+                        ataxic:constant(RosterID)
+                     )
+                  ]
+               )
+            ),
+            ataxic:read_permission(ataxic:constant(ataxia_security:any())),
+            ataxic:write_permission
+            (
+               ataxic:constant([ataxia_security:user_from_id(PlayerID)])
+            )
+         ]
+      ),
 
    ok = finalize_login(UsernameLC, EmailLC, PlayerID),
 
    ok =
-      shr_database:commit
+      ataxia:update
       (
-         shr_db_query:new(player_db, PlayerID, janitor, PlayerUpdateQueryOps)
+         player_db,
+         ataxia_security:janitor(),
+         PlayerUpdateQueryOps,
+         PlayerID
       ),