Finish server changes to retrieve resources and inventory

server/apps/server/src/character.erl

@@ -152,19 +152,20 @@ harvest_resource(#{name := Name,
 		   username := Username,
 		   email := Email,
 		   map_name := MapName,
-	 kind := Kind,
-	 x_position := XPosition,
-	 y_position := YPosition},
+		   kind := Kind,
+		   x_position := XPosition,
+		   y_position := YPosition},
 		 Connection) ->
     Harvest = "CALL map.harvest_resource($1::TEXT, $2::\"map\".OBJECT_TYPE, $3::REAL, $4::REAL, $5::TEXT, $6::TEXT, $7::TEXT);",
-    %% TODO
-    _Inventory = "SELECT item_name, quantity FROM character.inventory WHERE\
-                  name = $1::TEXT AND username = $2::TEXT AND e_mail",
-    _Resource = "",
+    Inventory = "SELECT item_name, quantity FROM map.resource_item_view WHERE\
+                  name = $1::TEXT AND username = $2::TEXT AND e_mail = $2::TEXT",
+    Resource = "SELECT quantity FROM map.resource WHERE map_name = $1::TEXT AND x_position = $2::REAL AND y_position = $3::REAL AND kind = $4::\"map\".OBJECT_TYPE",
     epgsql:with_transaction(Connection,
 				      fun (Conn) ->
                          do([postgres_m ||
-                             _ <- {epgsql:equery(Conn, Harvest, [MapName, Kind, XPosition, YPosition, Name, Email, Username]), call},
-                             return(ok)])
+				_ <- {epgsql:equery(Conn, Harvest, [MapName, Kind, XPosition, YPosition, Name, Email, Username]), call},
+				DeltaInventory <- {epgsql:equery(Connection, Inventory, [Name, Username, Email]), select},
+				DeltaResource <- {epgsql:equery(Connection, Resource, [MapName, XPosition, YPosition, Kind]), select},
+				return(#{delta_inventory => DeltaInventory, delta_resource => DeltaResource})])
 				      end,
-				      #{ begin_opts => "ISOLATION LEVEL READ UNCOMMITTED"}). % Double-check this.
+			    #{ begin_opts => "ISOLATION LEVEL READ UNCOMMITTED"}). % Double-check this.

server/apps/server/src/player.erl

@@ -15,7 +15,7 @@
 -compile({parse_transform, do}).
 
 -dialyzer({nowarn_function,
-           [exit_map/1, logout/1, joining_map/2, update/2, update_inventory/2]}).
+           [exit_map/1, logout/1, joining_map/2, update/2, harvest_resource/2]}).
 
 %%%===================================================================
 %%% API
@@ -209,8 +209,7 @@ joining_map(State, #{name := Name, map_name := MapName} = Request) ->
 -spec harvest_resource(user_state(), map()) -> ok.
 harvest_resource(State, Request) ->
     Pid = State#user_state.pid,
-    Connection = State#user_state.connection,
-
+    Connection = State#user_state.connection,   
     Result = character:harvest_resource(Request, Connection),
     Pid ! Result.
 

server/database/migrations/000004_character.sql

@@ -119,7 +119,7 @@ CREATE TABLE character.inventory(
        quantity SMALLINT NOT NULL,
        item_name TEXT NOT NULL,
        FOREIGN KEY (name, username, e_mail) REFERENCES character.instance(name, username, e_mail),
-       FOREIGN KEY (item_name) REFERENCES character.item(name),
+       FOREIGN KEY (name) REFERENCES character.item(name),
        PRIMARY KEY (name, username, e_mail, item_name)
 );
 

server/database/migrations/000005_resource.sql

@@ -10,6 +10,15 @@ CREATE TABLE IF NOT EXISTS map.object_is_resource(
        FOREIGN KEY (item_pk) REFERENCES character.item(name)
 );
 
+CREATE OR REPLACE VIEW map.resource_item_view AS
+SELECT i.name, inv.quantity FROM character.item i
+INNER JOIN map.object_is_resource oir
+ON i.name = oir.item_pk
+INNER JOIN character.inventory inv
+ON i.name = inv.name
+INNER JOIN character.instance ins
+ON ins.name = inv.name AND ins.username = inv.username AND ins.e_mail = inv.e_mail;
+
 CREATE TABLE IF NOT EXISTS map.resource(
        map_name TEXT NOT NULL,
        -- TODO: Add constraint depending on the same kind and position of the tile.