Updated API v2 handlers and access URLs

app/api/handlers/v2.py

@@ -69,11 +69,12 @@ class V2EveAPIProxyHandler(BaseHandler):
             params[key.lower()] = value
 
         try:
-            userid = request.GET.get('userid', None)
-            obj = EVEAccount.objects.get(pk=userid)
+            obj = EVEAccount.objects.get(pk=request.GET.get('userid', None))
             params['apikey'] = obj.api_key
         except EVEAccount.DoesNotExist:
-            pass
+            resp = rc.NOT_FOUND
+            resp.write({'user': 'notfound'})
+            return resp
 
         try:
             cached_doc = CachedDocument.objects.api_query(url_path, params)
@@ -96,7 +97,7 @@ class V2UserHandler(BaseHandler):
         for acc in u.eveaccount_set.all():
             for char in acc.characters.all().select_related('characters').values('id', 'name', 'corporation', 'corporation_date', 'corporation__name'):
                 d = dict(char)
-                d['eveaccount'] = acc.id
+                d['eveaccount'] = acc.pk
                 charlist.append(d)
 
         d = {'id': u.id,

app/api/urls.py

@@ -29,13 +29,24 @@ urlpatterns = patterns('',
     url(r'^announce/$', announce_resource),
 )
 
+urlpatterns += patterns('',
+    url(r'^1.0/user/$', user_resource),
+    url(r'^1.0/login/$', login_resource),
+    url(r'^1.0/eveapi/$', eveapi_resource),
+    url(r'^1.0/eveapi/', eveapiproxy_resource, name='api-eveapiproxy'),
+    url(r'^1.0/character/$', characters_resource),
+    url(r'^1.0/optimer/$', optimer_resource),
+    url(r'^1.0/blacklist/$', blacklist_resource),
+    url(r'^1.0/announce/$', announce_resource),
+)
+
 # v2 APIs
 v2_authenticate_resource = Resource(handler=V2AuthenticationHandler, **noauth)
 v2_eveapiproxy_resource = Resource(handler=V2EveAPIProxyHandler, **apikeyauth)
 v2_user_resource = Resource(handler=V2UserHandler, **apikeyauth)
 
 urlpatterns += patterns('',
-    url(r'^v2/authenticate/$', v2_authenticate_resource),
-    url(r'^v2/proxy/', v2_eveapiproxy_resource, name='v2-api-eveapiproxy'),
-    url(r'^v2/user/(?P<userid>\d+)/$', v2_user_resource), 
+    url(r'^2.0/authenticate/$', v2_authenticate_resource, name='v2-api-authenticate'),
+    url(r'^2.0/proxy/', v2_eveapiproxy_resource, name='v2-api-eveapiproxy'),
+    url(r'^2.0/user/(?P<userid>\d+)/$', v2_user_resource, name='v2-api-user'),
 )