Improve: api updated

Author: Shafaf

api/v1/__init__.py

@@ -6,3 +6,4 @@
 from .views import *
 from .plan import *
 from .subscription import *
+from .user import *

api/v1/plan.py

@@ -50,6 +50,6 @@ def post(self):
         db.session.add(plan)
         db.session.commit()    
 
-        return jsonify({"id": plan.id})
+        return jsonify({"id": plan.id}), 201
 
 v1.add_url_rule("/plan", view_func=Plans.as_view("plan"))

api/v1/subscription.py

@@ -1,10 +1,59 @@
-from flask import jsonify
+from flask import jsonify, request
 from flask.views import MethodView
 
 from . import v1
+from model.subscription import Subscription, Plan, User
+from extension import db
 
-class Subscription(MethodView):
+
+class Subscriptions(MethodView):
     def get(self):
-        return jsonify({"value": "yes, test is working....:)"})
+        subscription = Subscription.query.all()
+        sub_obj = [
+            {
+                "id" : sub.id,
+                "plan_id" : sub.plan_id,
+                "razorpay_user_id" : sub.razorpay_user_id,
+                "subscription_id" : sub.subscription_id,
+                "user_id": sub.user_id,
+                "subscription_status" : sub.subscription_status
+            }
+                for sub in subscription
+            ]
+        return jsonify(sub_obj), 200
+    
+    def post(self):
+        req: dict = request.get_json()
+        plan_id = req.get("plan_id")
+        
+        if plan_id is None:
+            return jsonify({"message": "plan_id is required"}), 400
+
+        # check is valid plan id
+        if not Plan.query.filter_by(id=plan_id).all():
+            return jsonify({"message" : "Not a valid plan_id"})
+            
+        if not Plan.query.filter_by(id=plan_id).all():
+            return jsonify({"message" : "Not a valid plan_id"})
+        
+        # check is valid user_id
+        user_id = req.get("user_id")
+        if user_id is not None:
+            user_exists = User.query.filter_by(id=user_id).first()
+            if not user_exists:
+                return jsonify({"message": "Not a valid user_id"}), 400
+       
+        sub = Subscription(
+            plan_id = req.get("plan_id"),
+            razorpay_user_id = req.get("razorpay_user_id"),
+            subscription_id = req.get("subscription_id"),
+            user_id = user_id,
+            subscription_status = req.get("subscription_status")
+        )
+        
+        db.session.add(sub)
+        db.session.commit()
+            
+        return jsonify({"id": sub.id}), 201
 
-v1.add_url_rule("/subscription", view_func=Subscription.as_view("subscription"))
+v1.add_url_rule("/subscription", view_func=Subscriptions.as_view("subscription"))

api/v1/user.py

@@ -0,0 +1,51 @@
+from flask import jsonify, request
+from flask.views import MethodView
+
+from . import v1
+from model.subscription import User
+from extension import db
+
+class Users(MethodView):
+    
+    def get(self):
+        users = User.query.all()
+        user_obj = [
+            {
+                "id" : user.id,
+                "name" : user.name,
+                "email" : user.email,
+                "phone_number" : user.phone_number   
+            }
+            for user in users
+        ]
+        return jsonify(user_obj), 200
+    
+    def post(self):
+        req: dict = request.get_json()
+        
+        # check and validate user input.
+        username = req.get("name")
+        email = req.get("email")
+        phone_number = req.get("phone_number")
+        
+        if not username:
+            return jsonify({"message" : "name is required"}), 400
+        
+        if not email:
+            return jsonify({"message" : "email is required"}), 400
+        
+        if not phone_number:
+            return jsonify({"message" : "phone_number is required"}), 400
+        
+        user = User(
+            name= username,
+            email= email,
+            phone_number=phone_number
+        )
+        
+        db.session.add(user)
+        db.session.commit()
+        
+        return jsonify({"id": user.id}), 201
+
+v1.add_url_rule("/users", view_func=Users.as_view('user'))

app.py

@@ -4,34 +4,23 @@
 from api.v1 import v1
 from connection import SQLALCHEMY_DATABASE_URI
 from extension import db , migrate
-from model import Plan
 
 def create_app():
     app = Flask(__name__)
 
     app.config["SQLALCHEMY_DATABASE_URI"] = SQLALCHEMY_DATABASE_URI
 
-    
     extensions(app)
 
-    
     # register the api points.
     app.register_blueprint(v1)
 
-    # checking is the application is running, remove me later.
-    @app.route("/")
-    def index():
-        return "hello how are you!"
-    
     return app
 
 
 def extensions(app):
     db.init_app(app)
     migrate.init_app(app, db)
 
-    with app.app_context():
-        db.create_all()
-    print("Result fetched successfully")
 
 create_app()

model/subscription.py

@@ -21,6 +21,7 @@ class Subscription(db.Model):
     plan_id = Column(Integer, ForeignKey(Plan.id), nullable=False)
     razorpay_user_id = Column(String)
     subscription_id = Column(String)
+    user_id = Column(Integer, ForeignKey("user.id"), nullable=True)
     subscription_status = Column(
         Enum(*STATUS_CHOICES, name="status", native_enum=False),
         nullable=False,