Lynn experiment

.gitignore

@@ -11,6 +11,7 @@ local_settings.py
 faircoin/faircoin.log*
 faircoin/faircoin_cron.log*
 .vagrant
+.idea/
 bin/
 cmd/create-user.sh
 include/

faircoin/views.py

@@ -155,9 +155,12 @@ def transfer_faircoins(request, resource_id):
                 )
                 return HttpResponseRedirect('/%s/%s/'
                     % ('faircoin/faircoin-history', resource.id))
-
-        return HttpResponseRedirect('/%s/%s/'
-                % ('faircoin/manage-faircoin-account', resource.id))
+        else:
+            raise ValidationError(send_coins_form.errors)
+    else:
+        raise Http404
+    return HttpResponseRedirect('/%s/%s/'
+        % ('faircoin/manage-faircoin-account', resource.id))
 
 
 @login_required

requirements.txt

@@ -18,12 +18,13 @@ djangorestframework
 jsonrpclib
 django-contrib-comments
 html5lib>0.99999999
-bleach
+bleach==2.0.0
 django-simple-captcha
 django-mptt
 pytz
+graphql-core==1.1
+graphene==1.4
 graphene-django==1.3
-graphene==1.4.1
 PyJWT
 six
 selenium

valuenetwork/api/models.py

@@ -1,6 +1,6 @@
 from django.db import models
 
-from valuenetwork.valueaccounting.models import Unit, EconomicEvent, Commitment
+from valuenetwork.valueaccounting.models import Unit, EconomicEvent, Commitment, Location, EconomicAgent
 from decimal import *
 
 # Helpers for dealing with Agent polymorphism
@@ -12,6 +12,7 @@ def formatAgent(agent):
                 id=agent.id,
                 name = agent.name,
                 note = agent.description,
+                primary_location = agent.primary_location,
                 image = agent.image)
         else:
             return Organization(
@@ -20,6 +21,7 @@ def formatAgent(agent):
                 note = agent.description,
                 image = agent.image,
                 is_context = agent.is_context,
+                primary_location = agent.primary_location,
                 type = agent.agent_type)
 
 def formatAgentList(agent_list):
@@ -47,6 +49,10 @@ class Organization(models.Model):
     image = models.CharField(max_length=255, blank=True)
     is_context = models.BooleanField(default=False)
     type = models.CharField(max_length=255)
+    primary_location = models.ForeignKey(Location,
+        related_name='orgs_at_location',
+        blank=True, null=True,
+        on_delete=models.DO_NOTHING)
 
     class Meta:
         managed = False
@@ -59,18 +65,25 @@ class Person(models.Model):
     image = models.CharField(max_length=255, blank=True)
     is_context = models.BooleanField(default=False)
     type = models.CharField(max_length=255, default="Person")
+    primary_location = models.ForeignKey(Location,
+        related_name='people_at_location',
+        blank=True, null=True,
+        on_delete=models.DO_NOTHING)
 
     class Meta:
         managed = False
 
 
 class Fulfillment(models.Model):
     fulfilled_by = models.ForeignKey(EconomicEvent,
-        related_name="fulfillments")
+        related_name="fulfillments",
+        on_delete=models.DO_NOTHING)
     fulfills = models.ForeignKey(Commitment,
-        related_name="fulfillments") 
+        related_name="fulfillments",
+        on_delete=models.DO_NOTHING) 
     fulfilled_quantity = models.ForeignKey(QuantityValue,
-        related_name="fulfillments")
+        related_name="fulfillments",
+        on_delete=models.DO_NOTHING)
     note = models.TextField(blank=True, null=True)
 
     class Meta:

valuenetwork/api/schema.py

@@ -22,8 +22,11 @@
 import valuenetwork.api.schemas.EconomicEvent
 import valuenetwork.api.schemas.QuantityValue
 import valuenetwork.api.schemas.Unit
-import valuenetwork.api.schemas.ResourceTaxonomyItem
+import valuenetwork.api.schemas.ResourceClassification
+import valuenetwork.api.schemas.ProcessClassification
 import valuenetwork.api.schemas.Commitment
+import valuenetwork.api.schemas.Plan
+import valuenetwork.api.schemas.Place
 from valuenetwork.api.schemas.helpers import hash_password
 
 
@@ -40,8 +43,11 @@ class ViewerQuery(
     valuenetwork.api.schemas.EconomicEvent.Query,
     valuenetwork.api.schemas.QuantityValue.Query,
     valuenetwork.api.schemas.Unit.Query,
-    valuenetwork.api.schemas.ResourceTaxonomyItem.Query,
+    valuenetwork.api.schemas.ResourceClassification.Query,
+    valuenetwork.api.schemas.ProcessClassification.Query,
     valuenetwork.api.schemas.Commitment.Query,
+    valuenetwork.api.schemas.Plan.Query,
+    valuenetwork.api.schemas.Place.Query,
     graphene.ObjectType
 ):
     def __init__(self, *args, **kwargs):
@@ -76,6 +82,11 @@ class Mutation(graphene.ObjectType):
     create_economic_event = valuenetwork.api.schemas.EconomicEvent.CreateEconomicEvent.Field()
     update_economic_event = valuenetwork.api.schemas.EconomicEvent.UpdateEconomicEvent.Field()
     delete_economic_event = valuenetwork.api.schemas.EconomicEvent.DeleteEconomicEvent.Field()
+    create_plan = valuenetwork.api.schemas.Plan.CreatePlan.Field()
+    update_plan = valuenetwork.api.schemas.Plan.UpdatePlan.Field()
+    delete_plan = valuenetwork.api.schemas.Plan.DeletePlan.Field()
+    update_economic_resource = valuenetwork.api.schemas.EconomicResource.UpdateEconomicResource.Field()
+    delete_economic_resource = valuenetwork.api.schemas.EconomicResource.DeleteEconomicResource.Field()
 
 
 schema = graphene.Schema(query=Query, mutation=Mutation)

valuenetwork/api/schemas/Agent.py

@@ -14,16 +14,15 @@
 
 class Query(graphene.AbstractType):
 
-    # define input query params
-
     my_agent = graphene.Field(Agent)
 
     agent = graphene.Field(Agent,
                            id=graphene.Int())
 
     all_agents = graphene.List(Agent)
 
-    # load single agents
+    user_is_authorized_to_create = graphene.Boolean(scope_id=graphene.Int())
+
 
     def resolve_my_agent(self, args, *rargs):
         agentUser = AgentUser.objects.filter(user=self.user).first()
@@ -40,7 +39,10 @@ def resolve_agent(self, args, *rargs):
                 return formatAgent(agent)
         raise PermissionDenied("Cannot find requested agent")
 
-    # load all agent lists
-
     def resolve_all_agents(self, args, context, info):
         return formatAgentList(EconomicAgent.objects.all())
+
+    def resolve_user_is_authorized_to_create(self, args, context, info):
+        context_agent_id = args.get('contest_agent_id')
+        user_agent = AgentUser.objects.filter(user=self.user).first().agent
+        return user_agent.is_authorized(context_agent_id=context_agent_id)