rattail/rattail-corepos
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Make CORE API client via app handler, not deprecated function

Browse source
This commit is contained in:
Lance Edgar 2023-09-18 08:12:20 -05:00
parent 7b9b6e57e2
commit ebdb658a2c
5 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rattail_corepos/batch/vendorcatalog.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2021 Lance Edgar # Copyright © 2010-2023 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -27,7 +27,6 @@ Handler for Vendor Catalog batches
import decimal import decimal
from rattail.batch import vendorcatalog as base from rattail.batch import vendorcatalog as base
from rattail_corepos.corepos.api import make_corepos_api
class VendorCatalogHandler(base.VendorCatalogHandler): class VendorCatalogHandler(base.VendorCatalogHandler):
@ -73,7 +72,7 @@ class VendorCatalogHandler(base.VendorCatalogHandler):
if not vendor_id: if not vendor_id:
raise ValueError("Batch vendor does not have valid CORE-POS ID") raise ValueError("Batch vendor does not have valid CORE-POS ID")
self.api = make_corepos_api(self.config) self.api = self.get_corepos_handler.make_webapi()
self.update_corepos(batch, rows, vendor_id, progress=progress, self.update_corepos(batch, rows, vendor_id, progress=progress,
# update_product_costs=kwargs.get('update_product_costs', False), # update_product_costs=kwargs.get('update_product_costs', False),
) )

8
rattail_corepos/corepos/office/commands.py
View file

@ -34,7 +34,6 @@ from rattail import commands
from rattail_corepos import __version__ from rattail_corepos import __version__
from rattail.util import load_object from rattail.util import load_object
from rattail_corepos.corepos.office.util import get_fannie_config_value from rattail_corepos.corepos.office.util import get_fannie_config_value
from rattail_corepos.corepos.api import make_corepos_api
from rattail_corepos.corepos.util import get_core_members from rattail_corepos.corepos.util import get_core_members
from rattail_corepos.config import core_office_url from rattail_corepos.config import core_office_url
@ -91,10 +90,7 @@ class Anonymize(commands.Subcommand):
"\tpip install names\n") "\tpip install names\n")
sys.exit(2) sys.exit(2)
from rattail_corepos.corepos.api import make_corepos_api api = self.app.get_corepos_handler().make_webapi()
from rattail_corepos.corepos.util import get_core_members
api = make_corepos_api(self.config)
members = get_core_members(self.config, api, progress=self.progress) members = get_core_members(self.config, api, progress=self.progress)
def anonymize(member, i): def anonymize(member, i):
@ -236,7 +232,7 @@ class PatchCustomerGaps(commands.Subcommand):
def run(self, args): def run(self, args):
from corepos.db.office_op import model as corepos from corepos.db.office_op import model as corepos
corepos_api = make_corepos_api(self.config) corepos_api = self.app.get_corepos_handler().make_webapi()
members = get_core_members(self.config, corepos_api, progress=self.progress) members = get_core_members(self.config, corepos_api, progress=self.progress)
tally = self.app.make_object(updated=0) tally = self.app.make_object(updated=0)

3
rattail_corepos/corepos/office/importing/model.py
View file

@ -27,7 +27,6 @@ CORE-POS model importers (webservices API)
from rattail import importing from rattail import importing
from rattail.util import data_diffs from rattail.util import data_diffs
from rattail_corepos.corepos.util import get_core_members from rattail_corepos.corepos.util import get_core_members
from rattail_corepos.corepos.api import make_corepos_api
class ToCOREAPIHandler(importing.ImportHandler): class ToCOREAPIHandler(importing.ImportHandler):
@ -83,7 +82,7 @@ class ToCoreAPI(importing.Importer):
self.establish_api() self.establish_api()
def establish_api(self): def establish_api(self):
self.api = make_corepos_api(self.config) self.api = self.app.get_corepos_handler().make_webapi()
def ensure_fields(self, data): def ensure_fields(self, data):
""" """

5
rattail_corepos/datasync/rattail.py
View file

@ -29,7 +29,6 @@ from sqlalchemy import orm
from corepos.db.office_op import Session as CoreSession, model as corepos from corepos.db.office_op import Session as CoreSession, model as corepos
from rattail.datasync import DataSyncImportConsumer from rattail.datasync import DataSyncImportConsumer
from rattail_corepos.corepos.api import make_corepos_api
class FromCOREAPIToRattail(DataSyncImportConsumer): class FromCOREAPIToRattail(DataSyncImportConsumer):
@ -42,11 +41,11 @@ class FromCOREAPIToRattail(DataSyncImportConsumer):
} }
def setup(self): def setup(self):
super(FromCOREAPIToRattail, self).setup() super().setup()
self.establish_api() self.establish_api()
def establish_api(self): def establish_api(self):
self.api = make_corepos_api(self.config) self.api = self.app.get_corepos_handler().make_webapi()
def pre_process_changes(self, session, changes): def pre_process_changes(self, session, changes):

3
rattail_corepos/importing/corepos/api.py
View file

@ -38,7 +38,6 @@ from rattail.core import get_uuid
from rattail.db.util import normalize_full_name from rattail.db.util import normalize_full_name
from rattail_corepos import importing as corepos_importing from rattail_corepos import importing as corepos_importing
from rattail_corepos.corepos.util import get_core_members from rattail_corepos.corepos.util import get_core_members
from rattail_corepos.corepos.api import make_corepos_api
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -100,7 +99,7 @@ class FromCOREPOSAPI(importing.Importer):
self.establish_api() self.establish_api()
def establish_api(self): def establish_api(self):
self.api = make_corepos_api(self.config) self.api = self.get_corepos_handler().make_webapi()
def should_ignore_new_members(self): def should_ignore_new_members(self):
if hasattr(self, 'ignore_new_members'): if hasattr(self, 'ignore_new_members'):