klmp200
/
Sith
mirror of https://github.com/ae-utbm/sith3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed old database bug in dev env

This commit is contained in:
Antoine Bartuccio 2016-09-02 21:24:10 +02:00
parent c5fd9d0076
commit 8328e668bd
3 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/models.py
View File

@ -240,7 +240,7 @@ class User(AbstractBaseUser):
else:
create = True
super(User, self).save(*args, **kwargs)
if create: # Create user on the old site: TODO remove me!
if create and settings.IS_OLD_MYSQL_PRESENT: # Create user on the old site: TODO remove me!
import MySQLdb
try:
db = MySQLdb.connect(**settings.OLD_MYSQL_INFOS)

9
sith/settings_sample.py
View File

@ -17,7 +17,13 @@ from django.utils.translation import ugettext_lazy as _
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
os.environ['HTTPS'] = "on"
DEV_ENV = True
if (DEV_ENV):
os.environ['HTTPS'] = "off"
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
else:
os.environ['HTTPS'] = "on"
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
@ -408,6 +414,7 @@ SITH_LAUNDERETTE_PRICES = {
'DRYING': 0.75,
}
IS_OLD_MYSQL_PRESENT = False
OLD_MYSQL_INFOS = {
'host': 'ae-db',
'user': "my_user",

83
subscription/models.py
View File

@ -33,7 +33,7 @@ class Subscriber(User):
if not self.id:
create = True
super(Subscriber, self).save()
if create:
if create and settings.IS_OLD_MYSQL_PRESENT:
try: # Create user on the old site: TODO remove me!
db = MySQLdb.connect(**settings.OLD_MYSQL_INFOS)
c = db.cursor()
@ -82,47 +82,48 @@ class Subscription(models.Model):
form.save(use_https=True, email_template_name='core/new_user_email.jinja',
subject_template_name='core/new_user_email_subject.jinja', from_email="ae@utbm.fr")
self.member.make_home()
try: # Create subscription on the old site: TODO remove me!
LOCATION = {
"SEVENANS": 5,
"BELFORT": 6,
"MONTBELIARD": 9,
"EBOUTIC": 5,
}
TYPE = {
'un-semestre' : 0,
'deux-semestres' : 1,
'cursus-tronc-commun' : 2,
'cursus-branche' : 3,
'membre-honoraire' : 4,
'assidu' : 5,
'amicale/doceo' : 6,
'reseau-ut' : 7,
'crous' : 8,
'sbarro/esta' : 9,
'cursus-alternant' : 10,
}
PAYMENT = {
"CHECK" : 1,
"CARD" : 2,
"CASH" : 3,
"OTHER" : 4,
"EBOUTIC" : 5,
"OTHER" : 0,
}
if settings.IS_OLD_MYSQL_PRESENT:
try: # Create subscription on the old site: TODO remove me!
LOCATION = {
"SEVENANS": 5,
"BELFORT": 6,
"MONTBELIARD": 9,
"EBOUTIC": 5,
}
TYPE = {
'un-semestre' : 0,
'deux-semestres' : 1,
'cursus-tronc-commun' : 2,
'cursus-branche' : 3,
'membre-honoraire' : 4,
'assidu' : 5,
'amicale/doceo' : 6,
'reseau-ut' : 7,
'crous' : 8,
'sbarro/esta' : 9,
'cursus-alternant' : 10,
}
PAYMENT = {
"CHECK" : 1,
"CARD" : 2,
"CASH" : 3,
"OTHER" : 4,
"EBOUTIC" : 5,
"OTHER" : 0,
}
db = MySQLdb.connect(**settings.OLD_MYSQL_INFOS)
c = db.cursor()
c.execute("""INSERT INTO ae_cotisations (id_utilisateur, date_cotis, date_fin_cotis, mode_paiement_cotis,
type_cotis, id_comptoir) VALUES (%s, %s, %s, %s, %s, %s)""", (self.member.id, self.subscription_start,
self.subscription_end, PAYMENT[self.payment_method], TYPE[self.subscription_type],
LOCATION[self.location]))
db.commit()
except Exception as e:
with open(settings.BASE_DIR+"/subscription_fail.log", "a") as f:
print("FAIL to add subscription to %s to old site" % (self.member), file=f)
print("Reason: %s" % (repr(e)), file=f)
db.rollback()
db = MySQLdb.connect(**settings.OLD_MYSQL_INFOS)
c = db.cursor()
c.execute("""INSERT INTO ae_cotisations (id_utilisateur, date_cotis, date_fin_cotis, mode_paiement_cotis,
type_cotis, id_comptoir) VALUES (%s, %s, %s, %s, %s, %s)""", (self.member.id, self.subscription_start,
self.subscription_end, PAYMENT[self.payment_method], TYPE[self.subscription_type],
LOCATION[self.location]))
db.commit()
except Exception as e:
with open(settings.BASE_DIR+"/subscription_fail.log", "a") as f:
print("FAIL to add subscription to %s to old site" % (self.member), file=f)
print("Reason: %s" % (repr(e)), file=f)
db.rollback()
def get_absolute_url(self):
return reverse('core:user_edit', kwargs={'user_id': self.member.pk})