Added more stuff and multiple api keys

portal/views.py

@@ -3,7 +3,8 @@ from django.shortcuts import render_to_response, HttpResponseRedirect
 from django.template import RequestContext
 from django.contrib.auth.decorators import login_required
 
-from evespecific.managers import EveCharacterManager
+from services.eveapi_manager import EveApiManager
+from evespecific.managers import EveManager
 from authentication.models import AllianceUserManager
 from services.phpbb3_manager import Phpbb3Manager
 from services.jabber_manager import JabberManager
@@ -23,25 +24,43 @@ def dashboard_view(request):
 
 @login_required
 def characters_view(request):
-    characterManager = EveCharacterManager()
+    evemanager = EveManager()
     
-    render_items = {'characters':characterManager.get_characters_by_owner_id(request.user.id)}
+    render_items = {'characters': evemanager.get_characters_by_owner_id(request.user.id)}
     return render_to_response('registered/characters.html', render_items, context_instance=RequestContext(request))
 
 
 @login_required
 def api_key_management_view(request):
+    api = EveApiManager()
+    evemanager = EveManager()
+
     if request.method == 'POST':
         form = UpdateKeyForm(request.POST)
 
         if form.is_valid():
+            evemanager.create_api_keypair(form.cleaned_data['api_id'],
+                                          form.cleaned_data['api_key'],
+                                          request.user)
 
-            return HttpResponseRedirect("/")
+            # Grab characters associated with the key pair
+
+            characters = api.get_characters_from_api(form.cleaned_data['api_id'], form.cleaned_data['api_key'])
+            evemanager.create_characters_from_list(characters, request.user, form.cleaned_data['api_id'])
+            return HttpResponseRedirect("/api_key_management/")
     else:
-        form = UpdateKeyForm(initial={'api_id':request.user.api_id,'api_key':request.user.api_key})
+        form = UpdateKeyForm()
+    context = {'form': form, 'apikeypairs': evemanager.get_api_key_pairs(request.user.id)}
+    return render_to_response('registered/apikeymanagment.html', context,
+                              context_instance=RequestContext(request))
 
-    return render_to_response('registered/apikeymanagment.html', {'form':form}, context_instance=RequestContext(request))
 
+@login_required
+def api_key_removal(request, api_id):
+    evemanager = EveManager()
+    evemanager.delete_api_key_pair(api_id, request.user.id)
+    evemanager.delete_characters_by_api_id(api_id, request.user.id)
+    return HttpResponseRedirect("/api_key_management/")
 
 @login_required
 def applications_view(request):
@@ -51,7 +70,7 @@ def applications_view(request):
 @login_required
 def main_character_change(request, id):
     userManager = AllianceUserManager()
-    characterManager = EveCharacterManager()
+    characterManager = EveManager()
     if characterManager.check_if_character_owned_by_user(id,request.user.id) == True:
         userManager.update_user_main_character(id,request.user.id)
         return HttpResponseRedirect("/")
@@ -65,7 +84,7 @@ def activate_forum(request):
 
     if userManager.check_if_user_exist(request.user.id):
         # Valid now we get the main characters
-        characterManager = EveCharacterManager()
+        characterManager = EveManager()
         character = characterManager.get_character_by_id(request.user.main_char_id)
         
         if forumManager.check_user(character.character_name) == False:
@@ -80,7 +99,7 @@ def activate_jabber(request):
     userManager = AllianceUserManager()
     jabberManager = JabberManager()
     if userManager.check_if_user_exist(request.user.id):
-        characterManager = EveCharacterManager()
+        characterManager = EveManager()
         character = characterManager.get_character_by_id(request.user.main_char_id)
     
         jabberManager.add_user(character.character_name,"test")
@@ -93,11 +112,11 @@ def activate_jabber(request):
 @login_required
 def activate_mumble(request):
     userManager = AllianceUserManager()
-    characterManager = EveCharacterManager()
+    characterManager = EveManager()
     mumbleManager = MumbleManager()
 
     if userManager.check_if_user_exist(request.user.id):
-        characterManager = EveCharacterManager()
+        characterManager = EveManager()
         character = characterManager.get_character_by_id(request.user.main_char_id)
 
         mumbleManager.create_user(character.character_name, "test")