| author | Sandro Knauß <knauss@netzguerilla.net> |
| Sat, 10 Mar 2012 19:00:12 +0100 | |
| branch | devel |
| changeset 219 | 4e9d79c35088 |
| parent 215 | 5bacdb7e94d1 |
| child 258 | 0a5eb5aac0be |
| permissions | -rw-r--r-- |
| 92 | 1 |
# -*- coding: utf-8 -*- |
2 |
||
3 |
from sqlalchemy import Column, Integer, String, Sequence, Boolean, DateTime, Numeric, Enum |
|
4 |
from sqlalchemy.ext.declarative import declarative_base |
|
5 |
||
6 |
#relationship |
|
7 |
from sqlalchemy import ForeignKey |
|
|
121
ca63b6776231
putting routes logic to schema
Sandro Knauß <knauss@netzguerilla.net>
parents:
117
diff
changeset
|
8 |
from sqlalchemy.orm import relationship, backref, object_session |
|
ca63b6776231
putting routes logic to schema
Sandro Knauß <knauss@netzguerilla.net>
parents:
117
diff
changeset
|
9 |
|
|
127
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
10 |
from sqlalchemy import and_ |
|
153
0e50d10c8b6c
handle detached objects
Sandro Knauß <knauss@netzguerilla.net>
parents:
150
diff
changeset
|
11 |
from sqlalchemy.orm.exc import DetachedInstanceError |
|
127
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
12 |
import sqlalchemy.sql.functions as func |
| 92 | 13 |
|
|
140
75d0eaaa871d
start fixing job mangement
Sandro Knauß <knauss@netzguerilla.net>
parents:
136
diff
changeset
|
14 |
import job |
|
125
19b3f383c9ce
getting job status form db
Sandro Knauß <knauss@netzguerilla.net>
parents:
122
diff
changeset
|
15 |
from ..error import JobNotFound |
|
19b3f383c9ce
getting job status form db
Sandro Knauß <knauss@netzguerilla.net>
parents:
122
diff
changeset
|
16 |
|
| 92 | 17 |
Base = declarative_base() |
18 |
||
19 |
class Userright(Base): |
|
|
201
843a7bcecbc8
renameing Userright.isDefault(bool) -> default(int)
Sandro Knauß <knauss@netzguerilla.net>
parents:
176
diff
changeset
|
20 |
"""Über welche Routen darf ein Benutzer Daten verschicken und welches sind die Standardrouten (<em>default!=None</em>) für den Benuter. Geordnert werden die Standardrouten nach default.""" |
| 92 | 21 |
__tablename__ = 'userright' |
|
94
4349f10d77a6
updatating schema for mysql
Sandro Knauß <knauss@netzguerilla.net>
parents:
92
diff
changeset
|
22 |
user_name = Column('user', String(100), ForeignKey('apiuser.name'), primary_key=True) |
|
4349f10d77a6
updatating schema for mysql
Sandro Knauß <knauss@netzguerilla.net>
parents:
92
diff
changeset
|
23 |
offer_name = Column('offer', String(100), ForeignKey('offer.name'), primary_key=True) |
|
201
843a7bcecbc8
renameing Userright.isDefault(bool) -> default(int)
Sandro Knauß <knauss@netzguerilla.net>
parents:
176
diff
changeset
|
24 |
default = Column(Integer) |
| 92 | 25 |
offer = relationship("Offer") |
|
127
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
26 |
user = relationship("User") |
| 92 | 27 |
|
|
201
843a7bcecbc8
renameing Userright.isDefault(bool) -> default(int)
Sandro Knauß <knauss@netzguerilla.net>
parents:
176
diff
changeset
|
28 |
def __init__(self, offer, default=None): |
| 117 | 29 |
self.offer = offer |
|
201
843a7bcecbc8
renameing Userright.isDefault(bool) -> default(int)
Sandro Knauß <knauss@netzguerilla.net>
parents:
176
diff
changeset
|
30 |
self.default = default |
| 117 | 31 |
|
|
127
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
32 |
@property |
|
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
33 |
def bill(self): |
|
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
34 |
'''getting a list of unbilled messages grouped by Job.info''' |
|
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
35 |
query = [ func.count(Message.id).label('anz'), # anz of messages |
|
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
36 |
func.sum(Message.price).label("price"), # price of the messages |
|
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
37 |
Job.info.label('info'), # info tag |
|
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
38 |
] |
|
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
39 |
|
|
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
40 |
filters = [ Message.isBilled==False, # only unbilled messages |
|
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
41 |
Job.user==self.user, # only jobs connected to user |
|
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
42 |
Message.offer==self.offer, # only messages in the right offer |
|
136
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
135
diff
changeset
|
43 |
Message.job_id==Job.id, # join Message and Job |
|
127
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
44 |
] |
|
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
45 |
return object_session(self).query(*query).filter(and_(*filters)).group_by(Job.info) |
|
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
46 |
|
| 92 | 47 |
class Offer(Base): |
48 |
"""Alle Routen über die SMS, Faxe und Mails verschickt werden könnnen. <em>provider</em>, <em>typ</em> und <em>route</em> werden verwendet, um die entsprechenden Zugangsdaten laden zu können.""" |
|
49 |
__tablename__ = "offer" |
|
|
94
4349f10d77a6
updatating schema for mysql
Sandro Knauß <knauss@netzguerilla.net>
parents:
92
diff
changeset
|
50 |
name = Column(String(100), primary_key=True) |
|
4349f10d77a6
updatating schema for mysql
Sandro Knauß <knauss@netzguerilla.net>
parents:
92
diff
changeset
|
51 |
provider = Column(String(100)) |
|
4349f10d77a6
updatating schema for mysql
Sandro Knauß <knauss@netzguerilla.net>
parents:
92
diff
changeset
|
52 |
route = Column(String(100)) |
|
4349f10d77a6
updatating schema for mysql
Sandro Knauß <knauss@netzguerilla.net>
parents:
92
diff
changeset
|
53 |
typ = Column(String(100)) |
|
122
b55754aa4f96
nun typs query into session object
Sandro Knauß <knauss@netzguerilla.net>
parents:
121
diff
changeset
|
54 |
|
|
176
71f1108758ef
more logic to schema.
Sandro Knauß <knauss@netzguerilla.net>
parents:
153
diff
changeset
|
55 |
@classmethod |
|
71f1108758ef
more logic to schema.
Sandro Knauß <knauss@netzguerilla.net>
parents:
153
diff
changeset
|
56 |
def get(cls, session, provider, route, typ): |
|
71f1108758ef
more logic to schema.
Sandro Knauß <knauss@netzguerilla.net>
parents:
153
diff
changeset
|
57 |
return session.query(cls).filter(and_(cls.provider==provider, cls.route==route, cls.typ==typ)).first() |
| 92 | 58 |
|
|
205
02ae72e8bab9
implementing vRoutes
Sandro Knauß <knauss@netzguerilla.net>
parents:
203
diff
changeset
|
59 |
@classmethod |
|
02ae72e8bab9
implementing vRoutes
Sandro Knauß <knauss@netzguerilla.net>
parents:
203
diff
changeset
|
60 |
def routes(cls, session, typ): |
|
02ae72e8bab9
implementing vRoutes
Sandro Knauß <knauss@netzguerilla.net>
parents:
203
diff
changeset
|
61 |
return session.query(cls).filter_by(typ=typ) |
|
02ae72e8bab9
implementing vRoutes
Sandro Knauß <knauss@netzguerilla.net>
parents:
203
diff
changeset
|
62 |
|
|
208
5da0f00ef872
session.typs -> Offer.typs
Sandro Knauß <knauss@netzguerilla.net>
parents:
205
diff
changeset
|
63 |
@classmethod |
|
5da0f00ef872
session.typs -> Offer.typs
Sandro Knauß <knauss@netzguerilla.net>
parents:
205
diff
changeset
|
64 |
def typs(cls, session): |
|
5da0f00ef872
session.typs -> Offer.typs
Sandro Knauß <knauss@netzguerilla.net>
parents:
205
diff
changeset
|
65 |
return session.query(cls.typ).distinct() |
|
205
02ae72e8bab9
implementing vRoutes
Sandro Knauß <knauss@netzguerilla.net>
parents:
203
diff
changeset
|
66 |
|
|
211
3fc1f400c107
adding Offer.provider
Sandro Knauß <knauss@netzguerilla.net>
parents:
208
diff
changeset
|
67 |
@classmethod |
|
3fc1f400c107
adding Offer.provider
Sandro Knauß <knauss@netzguerilla.net>
parents:
208
diff
changeset
|
68 |
def providers(cls, session, typ): |
|
3fc1f400c107
adding Offer.provider
Sandro Knauß <knauss@netzguerilla.net>
parents:
208
diff
changeset
|
69 |
return session.query(cls.provider).filter_by(typ=typ).distinct() |
|
3fc1f400c107
adding Offer.provider
Sandro Knauß <knauss@netzguerilla.net>
parents:
208
diff
changeset
|
70 |
|
| 92 | 71 |
class Message(Base): |
72 |
"""Wenn ein Vorgang von Iro Kosten erzeugt hat wird eine neue Zeile eingefügt. Solange nicht bezahlt wurde ist <em>isBilled=0</em>.""" |
|
73 |
__tablename__ = "message" |
|
74 |
id = Column(Integer, Sequence('message_id_seq'), primary_key=True) |
|
|
94
4349f10d77a6
updatating schema for mysql
Sandro Knauß <knauss@netzguerilla.net>
parents:
92
diff
changeset
|
75 |
recipient = Column(String(100)) |
| 92 | 76 |
isBilled = Column(Boolean) |
77 |
date = Column(DateTime) |
|
|
127
79966b937274
made bill (aka statistic) function ready
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
78 |
price = Column(Numeric(8,4)) |
|
215
5bacdb7e94d1
smstrade.StatusCode update
Sandro Knauß <knauss@netzguerilla.net>
parents:
211
diff
changeset
|
79 |
count = Column(Integer) |
|
5bacdb7e94d1
smstrade.StatusCode update
Sandro Knauß <knauss@netzguerilla.net>
parents:
211
diff
changeset
|
80 |
exID = Column(String(100)) |
|
136
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
135
diff
changeset
|
81 |
job_id = Column("job", String(40), ForeignKey('job.id')) |
| 92 | 82 |
job = relationship("Job", backref=backref('messages')) |
|
94
4349f10d77a6
updatating schema for mysql
Sandro Knauß <knauss@netzguerilla.net>
parents:
92
diff
changeset
|
83 |
offer_id = Column("offer",String(100), ForeignKey('offer.name')) |
| 92 | 84 |
offer = relationship("Offer", backref=backref('messages')) |
85 |
||
86 |
||
87 |
class Job(Base): |
|
88 |
"""Ein kompletter Auftrag, der an Iro zum verschicken übergeben wird. Status zeigt den generellen Status des Auftrages an (<em>init</em>, <em>started</em>, <em>sending</em>, <em>sended</em> oder <em>error</em>). <em>info</em> wird verwendet um dem Benutzer eine Möglickeit zu geben verschiede Auftragsgruppen zu erstellen.""" |
|
89 |
__tablename__ = "job" |
|
|
136
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
135
diff
changeset
|
90 |
id = Column(Integer, Sequence('job_id_seq'), primary_key=True) |
|
94
4349f10d77a6
updatating schema for mysql
Sandro Knauß <knauss@netzguerilla.net>
parents:
92
diff
changeset
|
91 |
info = Column(String(100)) |
| 92 | 92 |
status = Column(Enum("init","started","sending","sended","error")) |
|
94
4349f10d77a6
updatating schema for mysql
Sandro Knauß <knauss@netzguerilla.net>
parents:
92
diff
changeset
|
93 |
user_id = Column("user", String(100), ForeignKey('apiuser.name')) |
| 92 | 94 |
user = relationship("User", backref=backref('jobs')) |
95 |
||
|
140
75d0eaaa871d
start fixing job mangement
Sandro Knauß <knauss@netzguerilla.net>
parents:
136
diff
changeset
|
96 |
@property |
|
75d0eaaa871d
start fixing job mangement
Sandro Knauß <knauss@netzguerilla.net>
parents:
136
diff
changeset
|
97 |
def extend(self): |
|
75d0eaaa871d
start fixing job mangement
Sandro Knauß <knauss@netzguerilla.net>
parents:
136
diff
changeset
|
98 |
return job.exJobs[self.id] |
|
75d0eaaa871d
start fixing job mangement
Sandro Knauß <knauss@netzguerilla.net>
parents:
136
diff
changeset
|
99 |
|
|
75d0eaaa871d
start fixing job mangement
Sandro Knauß <knauss@netzguerilla.net>
parents:
136
diff
changeset
|
100 |
|
| 135 | 101 |
def __repr__(self): |
|
153
0e50d10c8b6c
handle detached objects
Sandro Knauß <knauss@netzguerilla.net>
parents:
150
diff
changeset
|
102 |
try: |
|
0e50d10c8b6c
handle detached objects
Sandro Knauß <knauss@netzguerilla.net>
parents:
150
diff
changeset
|
103 |
return "<Job('%s','%s','%s','%s')>"%(self.id,self.info, self.status, self.user_id) |
|
0e50d10c8b6c
handle detached objects
Sandro Knauß <knauss@netzguerilla.net>
parents:
150
diff
changeset
|
104 |
except DetachedInstanceError: |
|
0e50d10c8b6c
handle detached objects
Sandro Knauß <knauss@netzguerilla.net>
parents:
150
diff
changeset
|
105 |
return Base.__repr__(self) |
| 135 | 106 |
|
|
176
71f1108758ef
more logic to schema.
Sandro Knauß <knauss@netzguerilla.net>
parents:
153
diff
changeset
|
107 |
@classmethod |
|
71f1108758ef
more logic to schema.
Sandro Knauß <knauss@netzguerilla.net>
parents:
153
diff
changeset
|
108 |
def get(cls, session, id): |
|
71f1108758ef
more logic to schema.
Sandro Knauß <knauss@netzguerilla.net>
parents:
153
diff
changeset
|
109 |
return session.query(cls).filter_by(id=id).first() |
|
71f1108758ef
more logic to schema.
Sandro Knauß <knauss@netzguerilla.net>
parents:
153
diff
changeset
|
110 |
|
| 92 | 111 |
class User(Base): |
112 |
"""Die Benutzerdatenbank von Iro. <em>ng_kunde</em> ist der verknüpfte netzguerilla.net Benutzer, der die Rechnung zahlt.""" |
|
113 |
__tablename__ = "apiuser" |
|
|
94
4349f10d77a6
updatating schema for mysql
Sandro Knauß <knauss@netzguerilla.net>
parents:
92
diff
changeset
|
114 |
name = Column(String(100), primary_key=True) |
| 92 | 115 |
ng_kunde = Column(Integer) |
|
94
4349f10d77a6
updatating schema for mysql
Sandro Knauß <knauss@netzguerilla.net>
parents:
92
diff
changeset
|
116 |
apikey = Column(String(50),unique=True) |
| 92 | 117 |
rights = relationship('Userright') |
118 |
def __init__(self, name, apikey): |
|
119 |
self.name=name |
|
120 |
self.apikey=apikey |
|
121 |
||
122 |
def __repr__(self): |
|
|
153
0e50d10c8b6c
handle detached objects
Sandro Knauß <knauss@netzguerilla.net>
parents:
150
diff
changeset
|
123 |
try: |
|
0e50d10c8b6c
handle detached objects
Sandro Knauß <knauss@netzguerilla.net>
parents:
150
diff
changeset
|
124 |
return "<User('%s','%s')>"%(self.name,self.apikey) |
|
0e50d10c8b6c
handle detached objects
Sandro Knauß <knauss@netzguerilla.net>
parents:
150
diff
changeset
|
125 |
except DetachedInstanceError: |
|
0e50d10c8b6c
handle detached objects
Sandro Knauß <knauss@netzguerilla.net>
parents:
150
diff
changeset
|
126 |
return Base.__repr__(self) |
|
121
ca63b6776231
putting routes logic to schema
Sandro Knauß <knauss@netzguerilla.net>
parents:
117
diff
changeset
|
127 |
|
|
201
843a7bcecbc8
renameing Userright.isDefault(bool) -> default(int)
Sandro Knauß <knauss@netzguerilla.net>
parents:
176
diff
changeset
|
128 |
def routes(self, typ, default = False): |
|
148
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
129 |
'''returns a query object to get all possible routes for a given typ''' |
|
121
ca63b6776231
putting routes logic to schema
Sandro Knauß <knauss@netzguerilla.net>
parents:
117
diff
changeset
|
130 |
filters=[User.name == self.name, |
|
ca63b6776231
putting routes logic to schema
Sandro Knauß <knauss@netzguerilla.net>
parents:
117
diff
changeset
|
131 |
Offer.typ == typ, |
|
ca63b6776231
putting routes logic to schema
Sandro Knauß <knauss@netzguerilla.net>
parents:
117
diff
changeset
|
132 |
] |
|
201
843a7bcecbc8
renameing Userright.isDefault(bool) -> default(int)
Sandro Knauß <knauss@netzguerilla.net>
parents:
176
diff
changeset
|
133 |
if default: |
|
843a7bcecbc8
renameing Userright.isDefault(bool) -> default(int)
Sandro Knauß <knauss@netzguerilla.net>
parents:
176
diff
changeset
|
134 |
filters.append(Userright.default != None) |
|
203
b543ab9a9724
tests for Userright.default added
Sandro Knauß <knauss@netzguerilla.net>
parents:
201
diff
changeset
|
135 |
return object_session(self).query(Userright.offer_name).join(Offer,User).filter(and_(*filters)).order_by(Userright.default) |
|
148
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
136 |
|
|
201
843a7bcecbc8
renameing Userright.isDefault(bool) -> default(int)
Sandro Knauß <knauss@netzguerilla.net>
parents:
176
diff
changeset
|
137 |
def providers(self, typ, default = False): |
|
148
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
138 |
'''return a query object for all possible providers for a given typ''' |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
139 |
filters=[User.name == self.name, |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
140 |
Offer.typ == typ, |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
141 |
] |
|
201
843a7bcecbc8
renameing Userright.isDefault(bool) -> default(int)
Sandro Knauß <knauss@netzguerilla.net>
parents:
176
diff
changeset
|
142 |
if default: |
|
843a7bcecbc8
renameing Userright.isDefault(bool) -> default(int)
Sandro Knauß <knauss@netzguerilla.net>
parents:
176
diff
changeset
|
143 |
filters.append(Userright.default != None) |
|
148
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
144 |
return object_session(self).query(Offer.provider).join(Userright,User).filter(and_(*filters)) |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
145 |
|
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
146 |
def has_right(self, typ, offer_name = None, provider = None, route = None): |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
147 |
'''returns offer_name, if the user is allowed to use offer otherwise None |
|
150
c6896c3374c4
more offer tests an fixes in model.schema
Sandro Knauß <knauss@netzguerilla.net>
parents:
148
diff
changeset
|
148 |
->raise sqlalchemy.orm.exc.MultipleResultsFound if not a single offer match''' |
|
148
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
149 |
filters=[User.name == self.name, |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
150 |
Offer.typ == typ, |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
151 |
] |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
152 |
if offer_name: |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
153 |
filters.append(Userright.offer_name==offer_name) |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
154 |
if provider: |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
155 |
filters.append(Offer.provider==provider) |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
156 |
if route: |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
157 |
filters.append(Offer.route==route) |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
158 |
|
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
159 |
return object_session(self).query(Userright.offer_name).join(Offer,User).filter(and_(*filters)).scalar() |
|
11e0fdc1a58c
fill extendProvider with life
Sandro Knauß <knauss@netzguerilla.net>
parents:
140
diff
changeset
|
160 |
|
|
125
19b3f383c9ce
getting job status form db
Sandro Knauß <knauss@netzguerilla.net>
parents:
122
diff
changeset
|
161 |
def job(self, id): |
|
136
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
135
diff
changeset
|
162 |
job = object_session(self).query(Job).join(User).filter(and_(User.name == self.name, Job.id==id)).first() |
|
125
19b3f383c9ce
getting job status form db
Sandro Knauß <knauss@netzguerilla.net>
parents:
122
diff
changeset
|
163 |
if job is None: |
|
19b3f383c9ce
getting job status form db
Sandro Knauß <knauss@netzguerilla.net>
parents:
122
diff
changeset
|
164 |
raise JobNotFound() |
|
19b3f383c9ce
getting job status form db
Sandro Knauß <knauss@netzguerilla.net>
parents:
122
diff
changeset
|
165 |
return job |