Account importing now works

Author: EpocDotFr

HoH/D3API.py

@@ -12,19 +12,17 @@ class D3API:
  endpoint = None
  username = None
  id = None
- region_id = None
  region = None
 
- api_key = 'uevsvyrvw5qw6tksskk8r7em73ghbjck'
+ api_key = 'kk'
  locale = 'fr_FR'
 
- def __init__(self, region, region_id, username, id):
- self.endpoint = 'https://{}.api.battle.net/d3/'.format(region)
+ def __init__(self, region, username, id):
+ self.endpoint = 'https://{}.api.battle.net/d3/'.format(region.slug)
 
  self.region = region
  self.username = username
  self.id = id
- self.region_id = region_id
 
  def _call(self, endpoint):
  endpoint = endpoint + '?locale={}&apikey={}'.format(self.locale, self.api_key)
@@ -66,16 +64,16 @@ def import_profile(self):
 
  db.session.add(account)
 
- for hero in response:
- hero_class = Hero.query.filter(slug=hero.get('class')).first()
+ for hero in response['heroes']:
+ hero_class = HeroClass.query.filter_by(slug = hero['class']).first()
 
  hero = Hero(
- hero.id,
- hero.name,
- hero.gender,
- True if response.lastHeroPlayed == hero.id else False,
- True if hero.seasonal == 1 else False,
- True if hero.hardcore == 1 else False,
+ hero['id'],
+ hero['name'],
+ hero['gender'],
+ True if response['lastHeroPlayed'] == hero['id'] else False,
+ True if hero['seasonal'] == 1 else False,
+ True if hero['hardcore'] == 1 else False,
  account,
  hero_class
  )

HoH/models/Account.py

@@ -20,5 +20,5 @@ def __init__(self, battlenet_id, username, region, last_updated=None):
  def __repr__(self):
  return '<Account> #{} : {}'.format(self.id, self.username)
 
-def already_exists( battlenet_id, username, account_region_id):
+def already_exists(battlenet_id, username, account_region_id):
  return Account.query.filter_by(battlenet_id = battlenet_id, username = username, account_region_id = account_region_id).count() > 0

HoH/routes.py

@@ -29,7 +29,7 @@ def import_account():
  return jsonify(result)
 
  try:
- d3api = D3API(account_region.slug, account_region_id, username, battlenet_id)
+ d3api = D3API(account_region, username, battlenet_id)
 
  d3api.import_profile()