diff --git a/include/site.hrl b/include/site.hrl index 046936c..fc4d648 100644 --- a/include/site.hrl +++ b/include/site.hrl @@ -14,8 +14,8 @@ incidents = [] :: list(#incident{}), maintenance = [] :: list(#maintenance{}), state = open, - date = {2015,1,1}, - terminationDate = {2015,1,1} + date = [], + terminationDate = [] }). -endif. diff --git a/lib/up_rest.ex b/lib/up_rest.ex index 3356d73..06319c4 100644 --- a/lib/up_rest.ex +++ b/lib/up_rest.ex @@ -22,9 +22,9 @@ defmodule UP.HTTP do get "/subscription" do get3(conn,auth(conn),"subscription",[],"lst") end get "/subscription/:id" do get3(conn,auth(conn),"subscription",id,"get") end put "/subscription/:id" do put3(conn,auth(conn),"subscription",id,"put") end - get "/maintenanc" do get3(conn,auth(conn),"maintenanc",[],"lst") end - put "/maintenanc/:id" do put3(conn,auth(conn),"maintenanc",id,"put") end - get "/maintenanc/:id" do get3(conn,auth(conn),"maintenanc",id,"get") end + get "/maintenance" do get3(conn,auth(conn),"maintenance",[],"lst") end + put "/maintenance/:id" do put3(conn,auth(conn),"maintenance",id,"put") end + get "/maintenance/:id" do get3(conn,auth(conn),"maintenance",id,"get") end get "/component" do get3(conn,auth(conn),"component",[],"lst") end get "/component/:id" do get3(conn,auth(conn),"component",id,"get") end put "/component/:id" do put3(conn,auth(conn),"component",id,"put") end diff --git a/suite.sh b/suite.sh index 110fbd0..f26c7eb 100755 --- a/suite.sh +++ b/suite.sh @@ -5,3 +5,12 @@ curl -H "Auth: secret" -X GET "http://localhost:5010/account" curl -H "Auth: 01707135870515017000" -X PUT "http://localhost:5010/subscription/01707135870515049000" -d @priv/subscription.json ; echo curl -H "Auth: 01707135870515017000" -X PUT "http://localhost:5010/subscription/01707135870515049000" -d @priv/subscription.json ; echo curl -H "Auth: 01707135870515017000" -X GET "http://localhost:5010/subscription" +curl -H "Auth: 01707135870515017000" -X PUT "http://localhost:5010/site/01707135870515049000" -d @priv/site.json ; echo +curl -H "Auth: 01707135870515017000" -X PUT "http://localhost:5010/site/01707135870515049000" -d @priv/site.json ; echo +curl -H "Auth: 01707135870515017000" -X GET "http://localhost:5010/site" +curl -H "Auth: 01707135870515017000" -X PUT "http://localhost:5010/incident/01707135870515049000" -d @priv/incident.json ; echo +curl -H "Auth: 01707135870515017000" -X PUT "http://localhost:5010/incident/01707135870515049000" -d @priv/incident.json ; echo +curl -H "Auth: 01707135870515017000" -X GET "http://localhost:5010/incident" +curl -H "Auth: 01707135870515017000" -X PUT "http://localhost:5010/maintenance/01707135870515049000" -d @priv/maintenance.json ; echo +curl -H "Auth: 01707135870515017000" -X PUT "http://localhost:5010/maintenance/01707135870515049000" -d @priv/maintenance.json ; echo +curl -H "Auth: 01707135870515017000" -X GET "http://localhost:5010/maintenance"