From 7f2e1e11b1edf094e867fc8f5dabded118bc7a31 Mon Sep 17 00:00:00 2001 From: Nilovna Bascunan-Vasquez Date: Wed, 10 Aug 2011 14:39:53 -0400 Subject: [PATCH] =?utf8?q?Pi=C3=A8ces=20jointes=20et=201852:Changer=20les=20?= =?utf8?q?adresse=20hardcod=C3=A9=20dans=20l'API?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- auf/django/emploi/api.py | 30 +++++++++++++++++++----------- auf/django/emploi/settings.py | 4 ++++ 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/auf/django/emploi/api.py b/auf/django/emploi/api.py index 1fc1987..9e9d815 100644 --- a/auf/django/emploi/api.py +++ b/auf/django/emploi/api.py @@ -12,6 +12,7 @@ import datamaster_modeles.models as ref from poster.encode import MultipartParam from poster.encode import multipart_encode import urllib2 +import settings STATUS_OK = '200 OK' @@ -20,8 +21,12 @@ class API: def __init__(self, request): self.request = request - def offre_emploi_liste(self): - url = "http://127.0.0.1:8000/api/offre_emploi_liste/" + def offre_emploi_liste(self, env): + + if hasattr(settings, "RECRUTEMENT_URL"): + url = getattr(settings, "RECRUTEMENT_URL")[env] + "offre_emploi_liste/" + else: + raise ImportError, "Could not import settings RECRUTEMENT_PATH" r = req(url) liste_json = r.body_string() try: @@ -48,9 +53,12 @@ class API: obj_offres_emploi.append(offre) return obj_offres_emploi - def offre_emploi(self, offre_id): - url = "http://127.0.0.1:8000/api/offre_emploi/?id=%s" - r = req(url % (offre_id)) + def offre_emploi(self, offre_id, env): + if hasattr(settings, "RECRUTEMENT_URL"): + url = getattr(settings, "RECRUTEMENT_URL")[env] + "offre_emploi/?id=%s" + else: + raise ImportError, "Could not import settings RECRUTEMENT_PATH" + r = req(url % offre_id) offre_json = r.body_string() try: @@ -76,14 +84,14 @@ class API: obj_offres_emploi.append(offre) return obj_offres_emploi - def candidat_add(self, offre_id): - url = "http://127.0.0.1:8000/api/candidat_add/%s" % offre_id - r = Resource(url) - import pdb;pdb.set_trace() + def candidat_add(self, offre_id, env): + if hasattr(settings, "RECRUTEMENT_URL"): + url = getattr(settings, "RECRUTEMENT_URL")[env] + "candidat_add/%s" + else: + raise ImportError, "Could not import settings RECRUTEMENT_PATH" + r = Resource(url % offre_id) mp = MultipartParam.from_file('cv', self.request.POST.get('candidat_piece-0-nom')) - import pdb;pdb.set_trace() datagen, headers = multipart_encode([image_param]) - import pdb;pdb.set_trace() resp = r.post(payload=self.request.FILES, params_dict=self.request.POST) if resp.status == STATUS_OK: candidat_id = simplejson.loads(resp.body_string())['candidat_id'] diff --git a/auf/django/emploi/settings.py b/auf/django/emploi/settings.py index 101b2a1..0772d21 100644 --- a/auf/django/emploi/settings.py +++ b/auf/django/emploi/settings.py @@ -15,3 +15,7 @@ PRIVE_MEDIA_ROOT = getattr(settings, 'OE_PRIV_MEDIA_ROOT', # Examples: "http://media.lawrence.com", "http://example.com/media/" MEDIA_URL = '/media/' PRIVE_MEDIA_URL = '/prive/' + +RECRUTEMENT_URL = {'DEV':'http://127.0.0.1:8000/api/', + 'TEST':'http://test.ressources-humaines.auf.org/api/', + 'PROD':'http://ressources-humaines.auf.org/api/',} -- 1.7.10.4