Added "Date:" helper feature in EWF_HEADER
Added license.lic to restbuck example, and mainly copyright to Javier Use HTTP_STATUS_CODES Minor improvements using object tests Cosmetic (indentation, ..)
This commit is contained in:
Jocelyn Fiat
@@ -5,10 +5,10 @@ note
|
||||
revision: "$Revision$"
|
||||
|
||||
class
|
||||
ORDER_HANDLER[C -> REQUEST_HANDLER_CONTEXT]
|
||||
ORDER_HANDLER [C -> REQUEST_HANDLER_CONTEXT]
|
||||
inherit
|
||||
REQUEST_HANDLER[C]
|
||||
REQUEST_RESOURCE_HANDLER_HELPER[C]
|
||||
REQUEST_HANDLER [C]
|
||||
REQUEST_RESOURCE_HANDLER_HELPER [C]
|
||||
redefine
|
||||
do_get,
|
||||
do_post,
|
||||
@@ -20,8 +20,8 @@ inherit
|
||||
REFACTORING_HELPER
|
||||
SHARED_ORDER_VALIDATION
|
||||
|
||||
|
||||
feature -- execute
|
||||
|
||||
execute (ctx: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
|
||||
-- Execute request handler
|
||||
do
|
||||
@@ -29,49 +29,51 @@ feature -- execute
|
||||
end
|
||||
|
||||
feature -- API DOC
|
||||
|
||||
api_doc : STRING = "URI:/order METHOD: POST%N URI:/order/{orderid} METHOD: GET, PUT, DELETE%N"
|
||||
|
||||
feature -- HTTP Methods
|
||||
|
||||
do_get (ctx: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
|
||||
-- Using GET to retrieve resource information.
|
||||
-- If the GET request is SUCCESS, we response with
|
||||
-- 200 OK, and a representation of the order
|
||||
-- If the GET request is not SUCCESS, we response with
|
||||
-- 404 Resource not found
|
||||
-- Using GET to retrieve resource information.
|
||||
-- If the GET request is SUCCESS, we response with
|
||||
-- 200 OK, and a representation of the order
|
||||
-- If the GET request is not SUCCESS, we response with
|
||||
-- 404 Resource not found
|
||||
local
|
||||
joc : JSON_ORDER_CONVERTER
|
||||
l_order : detachable ORDER
|
||||
jv : detachable JSON_VALUE
|
||||
id : STRING
|
||||
uri : LIST[READABLE_STRING_32]
|
||||
uri : LIST [READABLE_STRING_32]
|
||||
h : EWF_HEADER
|
||||
do
|
||||
if attached req.orig_path_info as orig_path then
|
||||
uri := orig_path.split ('/')
|
||||
id := uri.at (3)
|
||||
create joc.make
|
||||
json.add_converter(joc)
|
||||
if db_access.orders.has_key (id) then
|
||||
l_order := db_access.orders.item (id)
|
||||
jv ?= json.value (l_order)
|
||||
if attached jv as j then
|
||||
create h.make
|
||||
h.put_status (ok)
|
||||
h.put_content_type ("application/json")
|
||||
if attached req.request_time as time then
|
||||
h.add_header ("Date:" +time.formatted_out ("ddd,[0]dd mmm yyyy [0]hh:[0]mi:[0]ss.ff2") + " GMT")
|
||||
end
|
||||
if l_order /= Void then
|
||||
h.add_header ("Etag: " + l_order.etag)
|
||||
end
|
||||
res.set_status_code (ok)
|
||||
res.write_headers_string (h.string)
|
||||
res.write_string (j.representation)
|
||||
if attached req.orig_path_info as orig_path then
|
||||
uri := orig_path.split ('/')
|
||||
id := uri.at (3)
|
||||
create joc.make
|
||||
json.add_converter(joc)
|
||||
if db_access.orders.has_key (id) then
|
||||
l_order := db_access.orders.item (id)
|
||||
jv ?= json.value (l_order)
|
||||
if attached jv as j then
|
||||
create h.make
|
||||
h.put_status ({HTTP_STATUS_CODE}.ok)
|
||||
h.put_content_type ("application/json")
|
||||
if attached req.request_time as time then
|
||||
h.add_header ("Date:" +time.formatted_out ("ddd,[0]dd mmm yyyy [0]hh:[0]mi:[0]ss.ff2") + " GMT")
|
||||
end
|
||||
else
|
||||
handle_resource_not_found_response ("The following resource"+ orig_path+ " is not found ", req.content_type, res)
|
||||
if l_order /= Void then
|
||||
h.add_header ("Etag: " + l_order.etag)
|
||||
end
|
||||
res.set_status_code ({HTTP_STATUS_CODE}.ok)
|
||||
res.write_headers_string (h.string)
|
||||
res.write_string (j.representation)
|
||||
end
|
||||
else
|
||||
handle_resource_not_found_response ("The following resource" + orig_path + " is not found ", ctx, req, res)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
do_put (ctx: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
|
||||
@@ -82,38 +84,37 @@ feature -- HTTP Methods
|
||||
jv : detachable JSON_VALUE
|
||||
h : EWF_HEADER
|
||||
do
|
||||
fixme ("TODO handle an Internal Server Error")
|
||||
fixme ("Refactor the code, create new abstractions")
|
||||
fixme ("Add Header Date to the response")
|
||||
fixme ("Put implememntation is wrong!!!!")
|
||||
req.input.read_stream (req.content_length_value.as_integer_32)
|
||||
l_post := req.input.last_string
|
||||
l_order := extract_order_request(l_post)
|
||||
fixme ("TODO move to a service method")
|
||||
if l_order /= Void and then db_access.orders.has_key (l_order.id) then
|
||||
update_order( l_order)
|
||||
create h.make
|
||||
h.put_status (ok)
|
||||
h.put_content_type ("application/json")
|
||||
if attached req.request_time as time then
|
||||
h.add_header ("Date:" +time.formatted_out ("ddd,[0]dd mmm yyyy [0]hh:[0]mi:[0]ss.ff2") + " GMT")
|
||||
end
|
||||
if attached req.http_host as host then
|
||||
l_location := "http://"+host +req.request_uri+"/" + l_order.id
|
||||
h.add_header ("Location:"+ l_location)
|
||||
end
|
||||
jv ?= json.value (l_order)
|
||||
if jv /= Void then
|
||||
h.put_content_length (jv.representation.count)
|
||||
res.set_status_code (ok)
|
||||
res.write_headers_string (h.string)
|
||||
res.write_string (jv.representation)
|
||||
end
|
||||
else
|
||||
handle_bad_request_response(l_post +"%N is not a valid ORDER, maybe the order does not exist in the system",req.content_type,res)
|
||||
fixme ("TODO handle an Internal Server Error")
|
||||
fixme ("Refactor the code, create new abstractions")
|
||||
fixme ("Add Header Date to the response")
|
||||
fixme ("Put implementation is wrong!!!!")
|
||||
req.input.read_stream (req.content_length_value.as_integer_32)
|
||||
l_post := req.input.last_string
|
||||
l_order := extract_order_request(l_post)
|
||||
fixme ("TODO move to a service method")
|
||||
if l_order /= Void and then db_access.orders.has_key (l_order.id) then
|
||||
update_order( l_order)
|
||||
create h.make
|
||||
h.put_status ({HTTP_STATUS_CODE}.ok)
|
||||
h.put_content_type ("application/json")
|
||||
if attached req.request_time as time then
|
||||
h.add_header ("Date:" +time.formatted_out ("ddd,[0]dd mmm yyyy [0]hh:[0]mi:[0]ss.ff2") + " GMT")
|
||||
end
|
||||
if attached req.http_host as host then
|
||||
l_location := "http://"+host +req.request_uri+"/" + l_order.id
|
||||
h.add_header ("Location:"+ l_location)
|
||||
end
|
||||
jv ?= json.value (l_order)
|
||||
if jv /= Void then
|
||||
h.put_content_length (jv.representation.count)
|
||||
res.set_status_code ({HTTP_STATUS_CODE}.ok)
|
||||
res.write_headers_string (h.string)
|
||||
res.write_string (jv.representation)
|
||||
end
|
||||
else
|
||||
handle_bad_request_response (l_post +"%N is not a valid ORDER, maybe the order does not exist in the system", ctx, req, res)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
do_delete (ctx: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
|
||||
local
|
||||
@@ -121,129 +122,123 @@ feature -- HTTP Methods
|
||||
id: STRING
|
||||
h : EWF_HEADER
|
||||
do
|
||||
fixme ("TODO handle an Internal Server Error")
|
||||
fixme ("Refactor the code, create new abstractions")
|
||||
if attached req.orig_path_info as orig_path then
|
||||
uri := orig_path.split ('/')
|
||||
id := uri.at (3)
|
||||
if db_access.orders.has_key (id) then
|
||||
delete_order( id)
|
||||
create h.make
|
||||
h.put_status (no_content)
|
||||
h.put_content_type ("application/json")
|
||||
if attached req.request_time as time then
|
||||
h.add_header ("Date:" +time.formatted_out ("ddd,[0]dd mmm yyyy [0]hh:[0]mi:[0]ss.ff2") + " GMT")
|
||||
end
|
||||
res.set_status_code (no_content)
|
||||
res.write_headers_string (h.string)
|
||||
else
|
||||
handle_resource_not_found_response (orig_path + " not found in this server",req.content_type, res)
|
||||
fixme ("TODO handle an Internal Server Error")
|
||||
fixme ("Refactor the code, create new abstractions")
|
||||
if attached req.orig_path_info as orig_path then
|
||||
uri := orig_path.split ('/')
|
||||
id := uri.at (3)
|
||||
if db_access.orders.has_key (id) then
|
||||
delete_order( id)
|
||||
create h.make
|
||||
h.put_status ({HTTP_STATUS_CODE}.no_content)
|
||||
h.put_content_type ("application/json")
|
||||
if attached req.request_time as time then
|
||||
h.put_utc_date (time)
|
||||
end
|
||||
res.set_status_code ({HTTP_STATUS_CODE}.no_content)
|
||||
res.write_headers_string (h.string)
|
||||
else
|
||||
handle_resource_not_found_response (orig_path + " not found in this server", ctx, req, res)
|
||||
end
|
||||
end
|
||||
|
||||
do_post (ctx: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
|
||||
-- Here the convention is the following.
|
||||
-- POST is used for creation and the server determines the URI
|
||||
-- of the created resource.
|
||||
-- If the request post is SUCCESS, the server will create the order and will response with
|
||||
-- HTTP_RESPONSE 201 CREATED
|
||||
-- if the request post is not SUCCESS, the server will response with
|
||||
-- HTTP_RESPONSE 400 BAD REQUEST, the client send a bad request
|
||||
-- HTTP_RESPONSE 500 INTERNAL_SERVER_ERROR, when the server can deliver the request
|
||||
local
|
||||
l_post: STRING
|
||||
l_order : detachable ORDER
|
||||
do
|
||||
req.input.read_stream (req.content_length_value.as_integer_32)
|
||||
l_post := req.input.last_string
|
||||
l_order := extract_order_request(l_post)
|
||||
if l_order /= Void then
|
||||
save_order( l_order)
|
||||
compute_response_post (ctx, req, res, l_order)
|
||||
else
|
||||
handle_bad_request_response(l_post +"%N is not a valid ORDER", req.content_type,res)
|
||||
end
|
||||
end
|
||||
|
||||
do_post (ctx: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
|
||||
-- Here the convention is the following.
|
||||
-- POST is used for creation and the server determines the URI
|
||||
-- of the created resource.
|
||||
-- If the request post is SUCCESS, the server will create the order and will response with
|
||||
-- HTTP_RESPONSE 201 CREATED
|
||||
-- if the request post is not SUCCESS, the server will response with
|
||||
-- HTTP_RESPONSE 400 BAD REQUEST, the client send a bad request
|
||||
-- HTTP_RESPONSE 500 INTERNAL_SERVER_ERROR, when the server can deliver the request
|
||||
local
|
||||
l_post: STRING
|
||||
do
|
||||
req.input.read_stream (req.content_length_value.as_integer_32)
|
||||
l_post := req.input.last_string
|
||||
if attached extract_order_request (l_post) as l_order then
|
||||
save_order (l_order)
|
||||
compute_response_post (ctx, req, res, l_order)
|
||||
else
|
||||
handle_bad_request_response (l_post +"%N is not a valid ORDER", ctx, req, res)
|
||||
end
|
||||
end
|
||||
|
||||
compute_response_post (ctx: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER; l_order : ORDER)
|
||||
local
|
||||
h: EWF_HEADER
|
||||
l_msg : STRING
|
||||
jv : detachable JSON_VALUE
|
||||
l_location : STRING
|
||||
do
|
||||
create h.make
|
||||
h.put_status (created)
|
||||
h.put_content_type ("application/json")
|
||||
jv ?= json.value (l_order)
|
||||
if jv /= Void then
|
||||
l_msg := jv.representation
|
||||
h.put_content_length (l_msg.count)
|
||||
if attached req.http_host as host then
|
||||
l_location := "http://"+host +req.request_uri+"/" + l_order.id
|
||||
h.add_header ("Location:"+ l_location)
|
||||
end
|
||||
if attached req.request_time as time then
|
||||
h.add_header ("Date:" +time.formatted_out ("ddd,[0]dd mmm yyyy [0]hh:[0]mi:[0]ss.ff2") + " GMT")
|
||||
end
|
||||
res.set_status_code (created)
|
||||
res.write_headers_string (h.string)
|
||||
res.write_string (l_msg)
|
||||
h.put_status ({HTTP_STATUS_CODE}.created)
|
||||
h.put_content_type_application_json
|
||||
if attached {JSON_VALUE} json.value (l_order) as jv then
|
||||
l_msg := jv.representation
|
||||
h.put_content_length (l_msg.count)
|
||||
if attached req.http_host as host then
|
||||
l_location := "http://" + host + req.request_uri + "/" + l_order.id
|
||||
h.put_location (l_location)
|
||||
end
|
||||
if attached req.request_time as time then
|
||||
h.add_header ("Date:" + time.formatted_out ("ddd,[0]dd mmm yyyy [0]hh:[0]mi:[0]ss.ff2") + " GMT")
|
||||
end
|
||||
res.set_status_code ({HTTP_STATUS_CODE}.created)
|
||||
res.write_headers_string (h.string)
|
||||
res.write_string (l_msg)
|
||||
end
|
||||
end
|
||||
|
||||
feature -- Implementation Repository Layer
|
||||
feature {NONE} -- Implementation Repository Layer
|
||||
|
||||
save_order ( an_order : ORDER)
|
||||
-- save the order to the repository
|
||||
save_order (an_order: ORDER)
|
||||
-- save the order to the repository
|
||||
local
|
||||
i : INTEGER
|
||||
do
|
||||
from
|
||||
i := 1
|
||||
until
|
||||
not db_access.orders.has_key ((db_access.orders.count + i).out)
|
||||
loop
|
||||
i := i + 1
|
||||
end
|
||||
an_order.set_id ((db_access.orders.count + i).out)
|
||||
an_order.set_status ("submitted")
|
||||
an_order.add_revision
|
||||
db_access.orders.force (an_order, an_order.id)
|
||||
from
|
||||
i := 1
|
||||
until
|
||||
not db_access.orders.has_key ((db_access.orders.count + i).out)
|
||||
loop
|
||||
i := i + 1
|
||||
end
|
||||
an_order.set_id ((db_access.orders.count + i).out)
|
||||
an_order.set_status ("submitted")
|
||||
an_order.add_revision
|
||||
db_access.orders.force (an_order, an_order.id)
|
||||
end
|
||||
|
||||
update_order ( an_order : ORDER)
|
||||
-- update the order to the repository
|
||||
update_order (an_order: ORDER)
|
||||
-- update the order to the repository
|
||||
do
|
||||
an_order.add_revision
|
||||
db_access.orders.force (an_order, an_order.id)
|
||||
end
|
||||
|
||||
delete_order ( an_order : STRING)
|
||||
-- update the order to the repository
|
||||
delete_order (an_order: STRING)
|
||||
-- update the order to the repository
|
||||
do
|
||||
db_access.orders.remove (an_order)
|
||||
end
|
||||
|
||||
extract_order_request (l_post : STRING) : detachable ORDER
|
||||
-- extract an object Order from the request, or Void
|
||||
-- if the request is invalid
|
||||
-- extract an object Order from the request, or Void
|
||||
-- if the request is invalid
|
||||
local
|
||||
joc : JSON_ORDER_CONVERTER
|
||||
parser : JSON_PARSER
|
||||
l_order : detachable ORDER
|
||||
jv : detachable JSON_VALUE
|
||||
do
|
||||
create joc.make
|
||||
json.add_converter(joc)
|
||||
create parser.make_parser (l_post)
|
||||
jv ?= parser.parse
|
||||
if jv /= Void and parser.is_parsed then
|
||||
l_order ?= json.object (jv, "ORDER")
|
||||
Result := l_order
|
||||
if attached parser.parse as jv and parser.is_parsed then
|
||||
Result ?= json.object (jv, "ORDER")
|
||||
end
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2011, Javier Velilla and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user