Upstart added #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

jvnsoares wants to merge 29 commits into itelo:master from jvnsoares:master

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,3 +1,11 @@
  
    CELCOMBiller

    ============

    CELCOMBiller is an open source biller system to *OpenBTS* and *Asterisk*

    # Used third-party libraries

    * pyst

    @@ -10,7 +18,7 @@
  
    ```bash

    $ virtualenv -p /usr/bin/python2.7 venv

    $ source venv/bin/activate

    $ pip install --allow-external pyst --allow-unverified pyst -r requirements.txt

    $ pip install --allow-external --allow-unverified -r requirements.txt

    ```

    ## Database setup

    @@ -21,13 +29,14 @@ Each SIP user must be inserted in the database of users with a balance. The pyth
  
    from flask import Flask

    from flask.ext.sqlalchemy import SQLAlchemy

    from config import db

    from models import User

    from models import User, Ballance

    admin = User('admin', 'adm123', '999999999', '9999', True)

    guest = User('guest', '123123', '999999999', '0000', False)

    admin = User(True,'administrator', 'nowhere', '000','admin', 'adm123', '999999999','999999999999999', '0' ,'0')

    guest = User(True,'guest', 'nowhere', '1','guest', '123123', '999999998','999999999999998', '0' ,'0')

    db.session.add(admin)

    db.session.add(guest)

    db.session.commit()

    ```

    @@ -41,7 +50,7 @@ To test the api we will use curl
  
    ###USER

    login is required to test:

    you must login before test the api:

    ```bash

    curl -c cookiefile -d "username=admin&password=adm123" -X POST -s http://localhost:5000/login

    @@ -50,25 +59,31 @@ curl -c cookiefile -d "username=admin&password=adm123" -X POST -s http://localho
  
    now to add user:

    ```bash

    curl -b cookiefile -H "Content-Type: application/json" -X POST -d '{"username":"yourusername","password":"yourpassword","clid":"999999999","imsi":"12345678900" "admin":'false'}' -s http://localhost:5000/api/users

    curl -b cookiefile -H "Content-Type: application/json" -X POST -d '{"username":"yourusername","password":"yourpassword","clid":"999999999","imsi":"12345678900", "admin":'false', "name":"administrator","adress":"lasse","cpf":"000","voice_balance":"0","data_balance":"0"}' -s http://localhost:5000/api/users

    ```

    the balance came by another table, so we want add balance to user we need run:

    add balance:

    add/remove data balance:

    ```bash

    curl -b cookiefile -H "Content-Type: application/json" -X POST -d '{"signal":"+", "type_":"increase", "value": "1000", "userId":1}' -s http://localhost:5000/api/balance

    curl -b cookiefile -H "Content-Type: application/json" -X POST -d '{"value": "1000", "user_id":3,"origin":"web"}' -s http://localhost:5000/api/data_balance

    #note that userId need some user id, in that case we use 1

    #to remove balance the value must be negative

    ```

    remove balance:

    add/remove voice balance:

    ```bash

    curl -b cookiefile -H "Content-Type: application/json" -X POST -d '{"signal":"+", "type_":"increase", "value": "1000", "userId":1}' -s http://localhost:5000/api/balance

    curl -b cookiefile -H "Content-Type: application/json" -X POST -d '{"value": "1000", "userId":1}' -s http://localhost:5000/api/voice_balance

    #note that userId need some user id, in that case we use 1

    #to remove balance the value must be negative

    ```

    update user

    ```bash

    @@ -81,18 +96,18 @@ remove user
  
    curl -X DELETE -s http://localhost:5000/api/users/yourusername -b cookiefile

    ```

    ###GROUPS

    ###Schedule

    add group

    ```bash

    curl -X POST -H "Content-Type: application/json" -d '{"name":"group_name","day":1, "month":1, "year":3000, "count":10, "users":[id_]}' -s http://localhost:5000/api/groups

    curl -X POST -H "Content-Type: application/json" -d '{"name":"group_name","day":1, "month":1, "year":3000, "count":10}' -s http://localhost:5000/api/schedules

    ```

    update group

    ```bash

    curl -X PATCH -H "Content-Type: application/json" -d '{}' -s http://localost:5000/api/groups/group_name

    curl -X PATCH -H "Content-Type: application/json" -d '{}' -s http://localost:5000/api/schedules/schedule

    ```

    @@ -145,25 +160,7 @@ celcombiller_reducer
  
    ```

    ## Upstart

    You dont need to write a constructor, you can either treat the addresses property on a Person instance as a list:

    a = Address(email='foo@bar.com')

    p = Person(name='foo')

    p.addresses.append(a)

    Or you can pass a list of addresses to the Person constructor

    a = Address(email='foo@bar.com')

    p = Person(name='foo', addresses=[a])

    In either case you can then access the addresses on your Person instance like so:

    db.session.add(p)

    db.session.add(a)

    db.session.commit()

    print p.addresses.count() # 1

    print p.addresses[0] # <Address object at 0x10c098ed0>

    print p.addresses.filter_by(email='foo@bar.com').count() # 1

    To have Celcombiler running as a service you have to modify the file celcombiller.conf and put it in your /etc/init directory.

adduser.py

-Original file line number
+Diff line change
@@ -1,11 +1,13 @@
-    from flask import Flask
-    from flask.ext.sqlalchemy import SQLAlchemy
     from config import db
-    from models import User, Ballance
+    from models import User
-    admin = User('admin', 'adm123', '999999999', True,'999999999999999')
-    guest = User('guest', '123123', '999999998', False,'000000000000000')
+    admin = User('0', 'administrator', '000', 'admin', 'adm123',
+                 '999999999', '999999999999999', '0', '0', 'nowhere')
+    guest = User('3', 'guest', '1', 'guest', '123123', '999999998',
+                 '999999999999998', '0', '0', 'nowhere')
     db.session.add(admin)
     db.session.add(guest)
     db.session.commit()

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstart added #9

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Upstart added #9

Are you sure you want to change the base?

Uh oh!

Upstart added #9

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!