update CLI and TUI

ceo/cli/members.py

@@ -4,12 +4,13 @@ from typing import Dict
 import click
 from zope import component
 
-from ..term_utils import get_terms_for_new_user, get_terms_for_renewal
+from ..term_utils import get_terms_for_renewal_for_user
 from ..utils import http_post, http_get, http_patch, http_delete, \
     get_failed_operations, user_dict_lines, get_adduser_operations
 from .utils import handle_stream_response, handle_sync_response, print_lines, \
     check_if_in_development
 from ceo_common.interfaces import IConfig
+from ceo_common.model.Term import get_terms_for_new_user
 from ceod.transactions.members import DeleteMemberTransaction
 
 

ceo/tui/controllers/AddUserController.py

@@ -3,9 +3,9 @@ from threading import Thread
 from ...utils import http_get
 from .Controller import Controller
 from .AddUserTransactionController import AddUserTransactionController
-import ceo.term_utils as term_utils
 from ceo.tui.models import TransactionModel
 from ceo.tui.views import AddUserConfirmationView, TransactionView
+from ceo_common.model.Term import get_terms_for_new_user
 from ceod.transactions.members import AddMemberTransaction
 
 
@@ -26,7 +26,7 @@ class AddUserController(Controller):
             body['program'] = self.model.program
         if self.model.forwarding_address:
             body['forwarding_addresses'] = [self.model.forwarding_address]
-        new_terms = term_utils.get_terms_for_new_user(self.model.num_terms)
+        new_terms = get_terms_for_new_user(self.model.num_terms)
         if self.model.membership_type == 'club_rep':
             body['non_member_terms'] = new_terms
         else:

ceo/tui/controllers/RenewUserController.py

@@ -28,7 +28,7 @@ class RenewUserController(SyncRequestController):
 
     def _get_next_terms(self):
         try:
-            self.model.new_terms = term_utils.get_terms_for_renewal(
+            self.model.new_terms = term_utils.get_terms_for_renewal_for_user(
                 self.model.username,
                 self.model.num_terms,
                 self.model.membership_type == 'club_rep',