Skip to content

Commit

Permalink
Delete account. Closes #11.
Browse files Browse the repository at this point in the history
  • Loading branch information
@fgaudin
fgaudin committed Feb 15, 2011
1 parent c9324d9 commit 58f613b
Show file tree
Hide file tree
Showing 17 changed files with 530 additions and 55 deletions.
21 changes: 17 additions & 4 deletions autoentrepreneur/fixtures/test_users.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,37 @@
}
},
{
"pk": 1,
"pk": 200,
"model": "core.ownedobject",
"fields": {
"owner": 1
}
},
{
"pk": 200,
"model": "autoentrepreneur.subscription",
"fields": {
"expiration_date": "2010-02-14",
"state": 4,
"error_message": "Pay\u00e9e",
"user": 1,
"transaction_id": "ABCD"
}
},
{
"pk": 2,
"pk": 201,
"model": "core.ownedobject",
"fields": {
"owner": 2
}
},

{
"pk": 201,
"model": "autoentrepreneur.subscription",
"fields": {
"expiration_date": "2010-02-14",
"state": 4,
"error_message": "Pay\u00e9e",
"user": 2,
"transaction_id": "ABCDE"
}
},
Expand Down
124 changes: 124 additions & 0 deletions ...migrations/0008_auto__del_field_subscription_user__del_field_subscription_id__add_fiel.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

class Migration(SchemaMigration):

def forwards(self, orm):

# Deleting field 'Subscription.user'
db.delete_column('autoentrepreneur_subscription', 'user_id')

# Deleting field 'Subscription.id'
db.delete_column('autoentrepreneur_subscription', 'id')

# Adding field 'Subscription.ownedobject_ptr'
db.add_column('autoentrepreneur_subscription', 'ownedobject_ptr', self.gf('django.db.models.fields.related.OneToOneField')(default=0, to=orm['core.OwnedObject'], unique=True, primary_key=True), keep_default=False)


def backwards(self, orm):

# We cannot add back in field 'Subscription.user'
raise RuntimeError(
"Cannot reverse this migration. 'Subscription.user' and its values cannot be restored.")

# We cannot add back in field 'Subscription.id'
raise RuntimeError(
"Cannot reverse this migration. 'Subscription.id' and its values cannot be restored.")

# Deleting field 'Subscription.ownedobject_ptr'
db.delete_column('autoentrepreneur_subscription', 'ownedobject_ptr_id')


models = {
'auth.group': {
'Meta': {'object_name': 'Group'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
'auth.permission': {
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
'auth.user': {
'Meta': {'object_name': 'User'},
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
},
'autoentrepreneur.saleslimit': {
'Meta': {'object_name': 'SalesLimit'},
'activity': ('django.db.models.fields.IntegerField', [], {}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'limit': ('django.db.models.fields.IntegerField', [], {}),
'limit2': ('django.db.models.fields.IntegerField', [], {}),
'year': ('django.db.models.fields.IntegerField', [], {})
},
'autoentrepreneur.subscription': {
'Meta': {'object_name': 'Subscription', '_ormbases': ['core.OwnedObject']},
'error_message': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
'expiration_date': ('django.db.models.fields.DateField', [], {}),
'ownedobject_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.OwnedObject']", 'unique': 'True', 'primary_key': 'True'}),
'state': ('django.db.models.fields.IntegerField', [], {}),
'transaction_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'})
},
'autoentrepreneur.userprofile': {
'Meta': {'object_name': 'UserProfile'},
'activity': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
'address': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contact.Address']"}),
'bank_information': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}),
'company_id': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}),
'company_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}),
'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
'creation_help': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'freeing_tax_payment': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'payment_option': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
},
'contact.address': {
'Meta': {'object_name': 'Address', '_ormbases': ['core.OwnedObject']},
'city': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}),
'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contact.Country']", 'null': 'True', 'blank': 'True'}),
'ownedobject_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.OwnedObject']", 'unique': 'True', 'primary_key': 'True'}),
'street': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
'zipcode': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '10', 'blank': 'True'})
},
'contact.country': {
'Meta': {'ordering': "['country_name']", 'object_name': 'Country'},
'country_code2': ('django.db.models.fields.CharField', [], {'max_length': '2'}),
'country_code3': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
'country_name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
},
'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
'core.ownedobject': {
'Meta': {'object_name': 'OwnedObject'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
}
}

complete_apps = ['autoentrepreneur']
24 changes: 17 additions & 7 deletions autoentrepreneur/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
from contact.models import Address
from django.db.models.signals import post_save
from django.db.models.aggregates import Max
from core.models import OwnedObject
from bugtracker.models import Issue, Comment, Vote
import datetime

AUTOENTREPRENEUR_ACTIVITY_PRODUCT_SALE_BIC = 1
Expand Down Expand Up @@ -32,8 +34,7 @@ class SalesLimit(models.Model):
(SUBSCRIPTION_STATE_TRIAL, _('Trial')),
(SUBSCRIPTION_STATE_FREE, _('Free')))

class Subscription(models.Model):
user = models.ForeignKey(User, verbose_name=_('User'))
class Subscription(OwnedObject):
state = models.IntegerField(choices=SUBSCRIPTION_STATE, verbose_name=_('State'))
expiration_date = models.DateField(verbose_name=_('Expiration date'))
transaction_id = models.CharField(verbose_name=_('Transaction id'), unique=True, max_length=50)
Expand Down Expand Up @@ -68,6 +69,12 @@ class UserProfile(models.Model):
freeing_tax_payment = models.BooleanField(verbose_name=_('Freeing tax payment')) # versement liberatoire
payment_option = models.IntegerField(choices=AUTOENTREPRENEUR_PAYMENT_OPTION, blank=True, null=True, verbose_name=_('Payment option'))

def unregister(self):
Issue.objects.filter(owner=self.user).update(owner=None)
Comment.objects.filter(owner=self.user).update(owner=None)
Vote.objects.filter(owner=self.user).delete()
self.user.delete()

def settings_defined(self):
settings_defined = False
if self.user.first_name \
Expand All @@ -86,13 +93,13 @@ def settings_defined(self):

def is_allowed(self):
try:
Subscription.objects.get(user=self.user,
Subscription.objects.get(owner=self.user,
state__in=[SUBSCRIPTION_STATE_FREE])
return True
except:
pass
try:
Subscription.objects.get(user=self.user,
Subscription.objects.get(owner=self.user,
state__in=[SUBSCRIPTION_STATE_PAID, SUBSCRIPTION_STATE_TRIAL],
expiration_date__gte=datetime.date.today())
return True
Expand All @@ -102,7 +109,7 @@ def is_allowed(self):
return False

def get_next_expiration_date(self):
last_valid_expiration_date = Subscription.objects.filter(user=self.user,
last_valid_expiration_date = Subscription.objects.filter(owner=self.user,
state__in=[SUBSCRIPTION_STATE_PAID,
SUBSCRIPTION_STATE_TRIAL]).aggregate(last_date=Max('expiration_date'))
today = datetime.date.today()
Expand All @@ -120,7 +127,7 @@ def get_next_expiration_date(self):
return next_date

def get_last_subscription(self):
subscription = Subscription.objects.filter(user=self.user).exclude(state=SUBSCRIPTION_STATE_NOT_PAID).order_by('-expiration_date')[0]
subscription = Subscription.objects.filter(owner=self.user).exclude(state=SUBSCRIPTION_STATE_NOT_PAID).order_by('-expiration_date')[0]
return subscription

def get_sales_limit(self, year=None):
Expand Down Expand Up @@ -277,8 +284,11 @@ def user_post_save(sender, instance, created, **kwargs):
profile.address = address
profile.save()

try:
Subscription.objects.get(owner=instance)
except:
today = datetime.date.today()
subscription = Subscription.objects.create(user=instance,
subscription = Subscription.objects.create(owner=instance,
state=SUBSCRIPTION_STATE_TRIAL,
expiration_date=today + datetime.timedelta(30),
transaction_id='TRIAL-%i%i%i-%i' % (today.year, today.month, today.day, instance.id))
Expand Down
Loading

0 comments on commit 58f613b

Please sign in to comment.