papi-projects 0.2.0__tar.gz → 0.2.1__tar.gz

{papi_projects-0.2.0 → papi_projects-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: papi-projects
-Version: 0.2.0
+Version: 0.2.1
 Summary: PAPI is an API for managing projects
 License: MIT
 Author: sandyjmacdonald

{papi_projects-0.2.0 → papi_projects-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "papi-projects"
-version = "0.2.0"
+version = "0.2.1"
 description = "PAPI is an API for managing projects"
 authors = ["sandyjmacdonald <sandyjmacdonald@gmail.com>"]
 license = "MIT"

{papi_projects-0.2.0 → papi_projects-0.2.1}/scripts/create_notion_project.py

@@ -51,24 +51,24 @@ def main():
     project_name = args.name
     project_id = args.project_id
 
-    if user_id and not user_name:
-        user = User(user_id=user_id)
-    elif user_name and not user_id:
-        user = User(user_name)
-    elif user_id and user_name:
-        user = User(user_name, user_id=user_id)
-    else:
-        logger.warning("Please provide either a three-letter user ID and/or user name")
-        return
-
     if project_id and not project_name:
         project = Project(id=project_id)
+        user_id = project.user_id
+        user = User(user_id=user_id)
     elif project_name and not project_id:
+        if user_id and not user_name:
+            user = User(user_id=user_id)
+        elif user_name and not user_id:
+            user = User(user_name)
+        elif user_id and user_name:
+            user = User(user_name, user_id=user_id)
         project = Project(name=project_name, user_id=user.user_id)
     elif project_id and project_name:
         project = Project(name=project_name, id=project_id)
+        user_id = project.user_id
+        user = User(user_id=user_id)
     else:
-        logger.warning("Please provide either a valid project ID and/or project name")
+        logger.warning("Please provide either a valid project ID or valid three-letter user ID")
         return
 
     # Create project on Notion

{papi_projects-0.2.0 → papi_projects-0.2.1}/scripts/create_project.py

@@ -108,24 +108,24 @@ def main():
     enable_toggl = args.enable_toggl
     enable_notion = args.enable_notion
 
-    if user_id and not user_name:
-        user = User(user_id=user_id)
-    elif user_name and not user_id:
-        user = User(user_name)
-    elif user_id and user_name:
-        user = User(user_name, user_id=user_id)
-    else:
-        logger.warning("Please provide either a three-letter user ID and/or user name")
-        return
-
     if project_id and not project_name:
         project = Project(id=project_id)
+        user_id = project.user_id
+        user = User(user_id=user_id)
     elif project_name and not project_id:
+        if user_id and not user_name:
+            user = User(user_id=user_id)
+        elif user_name and not user_id:
+            user = User(user_name)
+        elif user_id and user_name:
+            user = User(user_name, user_id=user_id)
         project = Project(name=project_name, user_id=user.user_id)
     elif project_id and project_name:
         project = Project(name=project_name, id=project_id)
+        user_id = project.user_id
+        user = User(user_id=user_id)
     else:
-        logger.warning("Please provide either a valid project ID and/or project name")
+        logger.warning("Please provide either a valid project ID or valid three-letter user ID")
         return
 
     if enable_toggl:

{papi_projects-0.2.0 → papi_projects-0.2.1}/scripts/create_toggl_project.py

@@ -53,28 +53,18 @@ def main():
     project_name = args.name
     project_id = args.project_id
 
-    if not project_id and user_id:
-        # Create project instance, grant code and name are optional
-        if grant_code and project_name:
-            project = Project(user_id=user_id, grant_code=grant_code, name=project_name)
-        elif grant_code and not project_name:
-            project = Project(user_id=user_id, grant_code=grant_code)
-        elif not grant_code and project_name:
-            project = Project(user_id=user_id, name=project_name)
+    if project_id and not project_name:
+        project = Project(id=project_id)
+    elif project_name and not project_id:
+        if user_id:
+            project = Project(name=project_name, user_id=user_id)
         else:
-            project = Project(user_id=user_id)
-    elif not user_id and project_id:
-        # Create project instance, grant code and name are optional
-        if grant_code and project_name:
-            project = Project(id=project_id, grant_code=grant_code, name=project_name)
-        elif grant_code and not project_name:
-            project = Project(id=project_id, grant_code=grant_code)
-        elif not grant_code and project_name:
-            project = Project(id=project_id, name=project_name)
-        else:
-            project = Project(id=project_id)
+            logger.warning("Please provide either a valid project ID or valid three-letter user ID")
+            return
+    elif project_id and project_name:
+        project = Project(name=project_name, id=project_id)
     else:
-        logger.warning("Please provide either a three-letter user_id *or* a full project_id")
+        logger.warning("Please provide either a valid project ID or valid three-letter user ID")
         return
 
     # Create project on Toggl Track