readaptació a facturació

app/api.py

@@ -150,35 +150,37 @@ def read_invoices(
                                       , limit=limit)
     return values
 
-@app.get("/invoices_oc_start/", tags=["Data", "Invoice"])
-def invoices_oc_start(
-        current_user: schemas.ApiUser = Depends(get_current_active_user),
-        db: Session = Depends(get_db)
-):
-    values = crud.start_invoices_oc(db)
-    return values
-
+# @app.get("/invoices_oc_start/", tags=["Data", "Invoice"])
+# def invoices_oc_start(
+#         current_user: schemas.ApiUser = Depends(get_current_active_user),
+#         db: Session = Depends(get_db)
+# ):
+#     values = crud.start_invoices_oc(db)
+#     return values
 
 
+# Es registra que es volen generar factures per un billing_run_id i es crida a odoo per que registri els valors
 @app.post("/invoices_oc/", tags=["Data", "Invoice"])
 def send_invoice_contracts(
         contractinvoice: schemas.ApiContractInvoiceCreate,
         current_user: schemas.ApiUser = Depends(get_current_active_user),
         db: Session = Depends(get_db)
 ):
-    values = crud.get_invoices_oc(db, contract_codes=contractinvoice.contracts, invoice = contractinvoice.invoice)
+    values = crud.get_invoices_oc(db, billing_run_uuid=contractinvoice.billing_run_uuid)
     return values
 
 
-@app.get("/invoices_oc_lines/", tags=["Data", "Invoice"])
-def get_invoices_oc_lines(
-        invoice: str,
-        current_user: schemas.ApiUser = Depends(get_current_active_user),
-        db: Session = Depends(get_db)
-):
-    values = crud.get_invoices_oc_lines(db, invoice)
-    return values
+#
+# @app.get("/invoices_oc_lines/", tags=["Data", "Invoice"])
+# def get_invoices_oc_lines(
+#         invoice: str,
+#         current_user: schemas.ApiUser = Depends(get_current_active_user),
+#         db: Session = Depends(get_db)
+# ):
+#     values = crud.get_invoices_oc_lines(db, invoice)
+#     return values
 
+# retorna el fitxer pdf d'una factura
 @app.get("/invoices_oc_pdf/", tags=["Data", "Invoice"])
 def read_invoices_oc_pdf(
         invoice: str,
@@ -188,6 +190,10 @@ def read_invoices_oc_pdf(
     values = crud.get_invoices_oc_pdf(db, invoice)
     return values
 
+
+# Odoo ho invoca quan s'ha de generar una factura pdf.
+# Aquest procés insereix a external.invoice_generator la factura a generar, però el proceś de generació es fa a través d'airflow
+# Al acabar el procés d'airflow s'ha de cridar a Odoo informant de la ubicació del pdf
 @app.get("/invoices_oc_generate_pdf/", tags=["Data", "Invoice"])
 def invoice_genrate_pdf(
         invoice: str,
@@ -216,54 +222,54 @@ def read_invoices_detail(
     return values
 
 
-
-@app.get("/opendata/contracts", tags=["Opendata"])
-def read_contracts_detail(
-        metric: str,
-        granularity: str = 'mes',
-        comarca: str = None,
-        provincia: str = None,
-        ccaa: str = None,
-        poblacio: str = None,
-        codipostal: str = None,
-        geography_level: str = 'Global',
-        tecnologia: str = None,
-        tipus_persona: str = None,
-        from_date: datetime.date = None,
-        to_date: datetime.date = None,
-        skip: int = 0,
-        limit: int = None,
-        current_user: schemas.ApiUser = Depends(get_current_active_user),
-        db: Session = Depends(get_db)
-):
-    values = crud.get_contracts_data(db, metric=metric, granularity=granularity, comarca=comarca,
-                                     provincia=provincia, ccaa=ccaa, poblacio=poblacio, codipostal=codipostal,
-                                     geography_level=geography_level,tecnologia=tecnologia, tipus_persona=tipus_persona,
-                                     from_date=from_date, to_date=to_date, skip=skip, limit=limit)
-    return values
-
-
-
-@app.get("/opendata/members", tags=["Opendata"])
-def read_members_detail(
-        metric: str,
-        granularity: str = 'mes',
-        comarca: str = None,
-        provincia: str = None,
-        ccaa: str = None,
-        poblacio: str = None,
-        codipostal: str = None,
-        geography_level: str = 'Global',
-        tipus_persona: str = None,
-        from_date: datetime.date = None,
-        to_date: datetime.date = None,
-        skip: int = 0,
-        limit: int = None,
-        current_user: schemas.ApiUser = Depends(get_current_active_user),
-        db: Session = Depends(get_db)
-):
-    values = crud.get_members_data(db, metric=metric, granularity=granularity, comarca=comarca,
-                                     provincia=provincia, ccaa=ccaa, poblacio=poblacio, codipostal=codipostal,
-                                     geography_level=geography_level, tipus_persona=tipus_persona,
-                                     from_date=from_date, to_date=to_date, skip=skip, limit=limit)
-    return values
+#
+# @app.get("/opendata/contracts", tags=["Opendata"])
+# def read_contracts_detail(
+#         metric: str,
+#         granularity: str = 'mes',
+#         comarca: str = None,
+#         provincia: str = None,
+#         ccaa: str = None,
+#         poblacio: str = None,
+#         codipostal: str = None,
+#         geography_level: str = 'Global',
+#         tecnologia: str = None,
+#         tipus_persona: str = None,
+#         from_date: datetime.date = None,
+#         to_date: datetime.date = None,
+#         skip: int = 0,
+#         limit: int = None,
+#         current_user: schemas.ApiUser = Depends(get_current_active_user),
+#         db: Session = Depends(get_db)
+# ):
+#     values = crud.get_contracts_data(db, metric=metric, granularity=granularity, comarca=comarca,
+#                                      provincia=provincia, ccaa=ccaa, poblacio=poblacio, codipostal=codipostal,
+#                                      geography_level=geography_level,tecnologia=tecnologia, tipus_persona=tipus_persona,
+#                                      from_date=from_date, to_date=to_date, skip=skip, limit=limit)
+#     return values
+#
+#
+#
+# @app.get("/opendata/members", tags=["Opendata"])
+# def read_members_detail(
+#         metric: str,
+#         granularity: str = 'mes',
+#         comarca: str = None,
+#         provincia: str = None,
+#         ccaa: str = None,
+#         poblacio: str = None,
+#         codipostal: str = None,
+#         geography_level: str = 'Global',
+#         tipus_persona: str = None,
+#         from_date: datetime.date = None,
+#         to_date: datetime.date = None,
+#         skip: int = 0,
+#         limit: int = None,
+#         current_user: schemas.ApiUser = Depends(get_current_active_user),
+#         db: Session = Depends(get_db)
+# ):
+#     values = crud.get_members_data(db, metric=metric, granularity=granularity, comarca=comarca,
+#                                      provincia=provincia, ccaa=ccaa, poblacio=poblacio, codipostal=codipostal,
+#                                      geography_level=geography_level, tipus_persona=tipus_persona,
+#                                      from_date=from_date, to_date=to_date, skip=skip, limit=limit)
+#     return values

app/crud.py

@@ -64,8 +64,8 @@ def start_invoices_oc(db):
     db.commit()
     return []
 
-def get_invoices_oc(db, contract_codes, invoice):
-    registries = get_invoice_oc(db, contract_codes, invoice)
+def get_invoices_oc(db, billing_run_uuid):
+    registries = get_invoice_oc(db, billing_run_uuid)
     return registries
 
 def get_invoices_oc_lines(db, invoice):

app/models.py

 import ast
 import uuid
 from sqlalchemy import Boolean, Column, Integer, String
+import requests
+from pandas import DataFrame
 
 from .database import Base
 
@@ -15,27 +17,81 @@ class ApiUser(Base):
     hashed_password = Column(String, nullable=False)
     is_active = Column(Boolean, default=True)
 
+'''
+{
+  "groupCode": "string", --> group_code
+  "invoiceDate": 0, --> CURRENT_DATE?
+  "invoiceLines": [
+    {
+      "description": "string", --> description_cat
+      "accountingCode": "string", ???
+      "amountWithoutTax": 0, --> preu
+      "amountWithTax": 0, --> amount_with_tax
+      "amountTax": 0,  --> amount_tax
+      "taxCode": "string", --> tax_code
+      "productCode": "string", --> code
+    }
+  ]
+}
+'''
+def get_invoice_oc(con, billing_run_uuid):
 
-def get_invoice_oc(con, contract_codes,invoice):
-    fltr_contracts = ""
-    ccin = "'xx'"
-    for contract in  contract_codes:
-        ccin += ", '" + str(contract) +"' "
-        qry = "insert into external.invoicing_contracts values ('{}', '{}')".format(str(contract), invoice)
-        con.execute(qry)
-        con.commit()
-    ccin = ccin.replace('xx, ','')
-    fltr_contracts = " and odoo_code in (" + ccin + ") "
-
-    statement = "select description_cat, code , sum(amount_without_tax) as preu, tax_percent " \
-        " from external.opencell_invoices " \
-        " where 1=1 " + fltr_contracts + " "\
-        " group by description_cat, code, tax_percent " \
-        " having sum(amount_without_tax)<>0 "
-
-    columns = ['description_cat' ,'code', 'preu', 'tax_percent']
+    statement = """
+        select oi.description_cat, oi.code
+         ,sum(oi.amount_without_tax) as preu
+         ,sum(oi.amount_tax) as amount_tax
+         ,sum(oi.amount_with_tax) as amount_with_tax
+         , oi.tax_percent, ocg.code as group_code, oi.tax_code
+        from external.opencell_invoices oi
+        join odoo_contract_contract occ on oi.odoo_code = occ.code 
+        join odoo_contract_group ocg on occ.contract_group_id = ocg.id 
+        where 1=1 
+        and billing_run_uuid='""" + billing_run_uuid + "' " + \
+        """group by oi.description_cat, oi.code, oi.tax_percent , oi.billing_run_uuid, ocg.code, oi.tax_code
+        having sum(oi.amount_without_tax)<>0"""
+
+#     statement = """
+#     select oi.description_cat, oi.code
+#  ,sum(oi.amount_without_tax) as preu
+#  ,sum(oi.amount_tax) as amount_tax
+#  ,sum(oi.amount_with_tax) as amount_with_tax
+#  , oi.tax_percent, substring(msidsn,4,3) as group_code, oi.tax_code
+# from external.opencell_invoices oi
+# join odoo_contract_contract occ on oi.odoo_code = occ.code
+# where 1=1
+# and  substring(msidsn,4,3) in ('015', '043', '329')
+# group by oi.description_cat, oi.code, oi.tax_percent , oi.billing_run_uuid, substring(msidsn,4,3), oi.tax_code
+# having sum(oi.amount_without_tax)<>0
+#     """
+
+    columns = ['description_cat' ,'code', 'preu', 'amount_tax', 'amount_with_tax', 'tax_percent', 'group_code', 'tax_code']
     registries = con.execute(statement)
 
+    df = DataFrame(registries.fetchall())
+    df.columns = registries.keys()
+    group = df.groupby(by='group_code')
+
+    for x in group:
+        data = {
+            "groupCode": x[0],
+            "invoiceDate": 0,
+            "invoiceLines": [],
+        }
+        df2 = df.loc[df['group_code'] == x[0]]
+        for index, row in df2.iterrows():
+            invoiceline =  {
+              "description": row['description_cat'],
+              "amountWithoutTax": float(round(row['preu'],2)),
+              "amountWithTax": float(round(row['amount_with_tax'],2)),
+              "amountTax": float(round(row['amount_tax'],2)),
+              "taxCode": row['tax_code'],
+              "productCode": row['code'],
+            }
+            data["invoiceLines"].append(invoiceline)
+        print(data)
+    # TODO fer la crida a odoo per cada grup_code de billing_run_id
+    # API_ENDPOINT = "http://pastebin.com/api/api_post.php"
+    # r = requests.post(url=API_ENDPOINT, data=data)
     return [dict(zip(columns, t)) for t in registries]
 
 

app/schemas.py

@@ -30,5 +30,4 @@ class ApiUser(ApiUserBase):
 
 
 class ApiContractInvoiceCreate(BaseModel):
-    contracts: List[int]
-    invoice: str
+    billing_run_uuid: str
\ No newline at end of file
\ No newline at end of file