-
-
-## Technology Stack and Features
-
-- โก [**FastAPI**](https://fastapi.tiangolo.com) for the Python backend API.
- - ๐งฐ [SQLModel](https://sqlmodel.tiangolo.com) for the Python SQL database interactions (ORM).
- - ๐ [Pydantic](https://docs.pydantic.dev), used by FastAPI, for the data validation and settings management.
- - ๐พ [PostgreSQL](https://www.postgresql.org) as the SQL database.
-- ๐ [React](https://react.dev) for the frontend.
- - ๐ Using TypeScript, hooks, Vite, and other parts of a modern frontend stack.
- - ๐จ [Chakra UI](https://chakra-ui.com) for the frontend components.
- - ๐ค An automatically generated frontend client.
- - ๐งช [Playwright](https://playwright.dev) for End-to-End testing.
- - ๐ฆ Dark mode support.
-- ๐ [Docker Compose](https://www.docker.com) for development and production.
-- ๐ Secure password hashing by default.
-- ๐ JWT (JSON Web Token) authentication.
-- ๐ซ Email based password recovery.
-- โ
Tests with [Pytest](https://pytest.org).
-- ๐ [Traefik](https://traefik.io) as a reverse proxy / load balancer.
-- ๐ข Deployment instructions using Docker Compose, including how to set up a frontend Traefik proxy to handle automatic HTTPS certificates.
-- ๐ญ CI (continuous integration) and CD (continuous deployment) based on GitHub Actions.
-
-### Dashboard Login
-
-[](https://github.com/fastapi/full-stack-fastapi-template)
-
-### Dashboard - Admin
-
-[](https://github.com/fastapi/full-stack-fastapi-template)
-
-### Dashboard - Create User
-
-[](https://github.com/fastapi/full-stack-fastapi-template)
-
-### Dashboard - Items
-
-[](https://github.com/fastapi/full-stack-fastapi-template)
-
-### Dashboard - User Settings
-
-[](https://github.com/fastapi/full-stack-fastapi-template)
-
-### Dashboard - Dark Mode
-
-[](https://github.com/fastapi/full-stack-fastapi-template)
-
-### Interactive API Documentation
-
-[](https://github.com/fastapi/full-stack-fastapi-template)
-
-## How To Use It
-
-You can **just fork or clone** this repository and use it as is.
-
-โจ It just works. โจ
-
-### How to Use a Private Repository
-
-If you want to have a private repository, GitHub won't allow you to simply fork it as it doesn't allow changing the visibility of forks.
-
-But you can do the following:
-
-- Create a new GitHub repo, for example `my-full-stack`.
-- Clone this repository manually, set the name with the name of the project you want to use, for example `my-full-stack`:
-
-```bash
-git clone git@github.com:fastapi/full-stack-fastapi-template.git my-full-stack
-```
-
-- Enter into the new directory:
-
-```bash
-cd my-full-stack
-```
-
-- Set the new origin to your new repository, copy it from the GitHub interface, for example:
-
-```bash
-git remote set-url origin git@github.com:octocat/my-full-stack.git
-```
-
-- Add this repo as another "remote" to allow you to get updates later:
-
-```bash
-git remote add upstream git@github.com:fastapi/full-stack-fastapi-template.git
-```
-
-- Push the code to your new repository:
-
-```bash
-git push -u origin master
-```
-
-### Update From the Original Template
-
-After cloning the repository, and after doing changes, you might want to get the latest changes from this original template.
-
-- Make sure you added the original repository as a remote, you can check it with:
-
-```bash
-git remote -v
-
-origin git@github.com:octocat/my-full-stack.git (fetch)
-origin git@github.com:octocat/my-full-stack.git (push)
-upstream git@github.com:fastapi/full-stack-fastapi-template.git (fetch)
-upstream git@github.com:fastapi/full-stack-fastapi-template.git (push)
-```
-
-- Pull the latest changes without merging:
-
-```bash
-git pull --no-commit upstream master
-```
-
-This will download the latest changes from this template without committing them, that way you can check everything is right before committing.
-
-- If there are conflicts, solve them in your editor.
-
-- Once you are done, commit the changes:
-
-```bash
-git merge --continue
-```
-
-### Configure
-
-You can then update configs in the `.env` files to customize your configurations.
-
-Before deploying it, make sure you change at least the values for:
-
-- `SECRET_KEY`
-- `FIRST_SUPERUSER_PASSWORD`
-- `POSTGRES_PASSWORD`
-
-You can (and should) pass these as environment variables from secrets.
-
-Read the [deployment.md](./deployment.md) docs for more details.
-
-### Generate Secret Keys
-
-Some environment variables in the `.env` file have a default value of `changethis`.
-
-You have to change them with a secret key, to generate secret keys you can run the following command:
-
-```bash
-python -c "import secrets; print(secrets.token_urlsafe(32))"
-```
-
-Copy the content and use that as password / secret key. And run that again to generate another secure key.
-
-## How To Use It - Alternative With Copier
-
-This repository also supports generating a new project using [Copier](https://copier.readthedocs.io).
-
-It will copy all the files, ask you configuration questions, and update the `.env` files with your answers.
-
-### Install Copier
-
-You can install Copier with:
-
-```bash
-pip install copier
-```
-
-Or better, if you have [`pipx`](https://pipx.pypa.io/), you can run it with:
-
-```bash
-pipx install copier
-```
-
-**Note**: If you have `pipx`, installing copier is optional, you could run it directly.
-
-### Generate a Project With Copier
-
-Decide a name for your new project's directory, you will use it below. For example, `my-awesome-project`.
-
-Go to the directory that will be the parent of your project, and run the command with your project's name:
-
-```bash
-copier copy https://github.com/fastapi/full-stack-fastapi-template my-awesome-project --trust
-```
-
-If you have `pipx` and you didn't install `copier`, you can run it directly:
-
-```bash
-pipx run copier copy https://github.com/fastapi/full-stack-fastapi-template my-awesome-project --trust
-```
-
-**Note** the `--trust` option is necessary to be able to execute a [post-creation script](https://github.com/fastapi/full-stack-fastapi-template/blob/master/.copier/update_dotenv.py) that updates your `.env` files.
-
-### Input Variables
-
-Copier will ask you for some data, you might want to have at hand before generating the project.
-
-But don't worry, you can just update any of that in the `.env` files afterwards.
-
-The input variables, with their default values (some auto generated) are:
-
-- `project_name`: (default: `"FastAPI Project"`) The name of the project, shown to API users (in .env).
-- `stack_name`: (default: `"fastapi-project"`) The name of the stack used for Docker Compose labels and project name (no spaces, no periods) (in .env).
-- `secret_key`: (default: `"changethis"`) The secret key for the project, used for security, stored in .env, you can generate one with the method above.
-- `first_superuser`: (default: `"admin@example.com"`) The email of the first superuser (in .env).
-- `first_superuser_password`: (default: `"changethis"`) The password of the first superuser (in .env).
-- `smtp_host`: (default: "") The SMTP server host to send emails, you can set it later in .env.
-- `smtp_user`: (default: "") The SMTP server user to send emails, you can set it later in .env.
-- `smtp_password`: (default: "") The SMTP server password to send emails, you can set it later in .env.
-- `emails_from_email`: (default: `"info@example.com"`) The email account to send emails from, you can set it later in .env.
-- `postgres_password`: (default: `"changethis"`) The password for the PostgreSQL database, stored in .env, you can generate one with the method above.
-- `sentry_dsn`: (default: "") The DSN for Sentry, if you are using it, you can set it later in .env.
-
-## Backend Development
-
-Backend docs: [backend/README.md](./backend/README.md).
-
-## Frontend Development
-
-Frontend docs: [frontend/README.md](./frontend/README.md).
-
-## Deployment
-
-Deployment docs: [deployment.md](./deployment.md).
-
-## Development
-
-General development docs: [development.md](./development.md).
-
-This includes using Docker Compose, custom local domains, `.env` configurations, etc.
-
-## Release Notes
-
-Check the file [release-notes.md](./release-notes.md).
-
-## License
-
-The Full Stack FastAPI Template is licensed under the terms of the MIT license.
diff --git a/acme.json b/acme.json
new file mode 100644
index 0000000000..0fa97337f5
--- /dev/null
+++ b/acme.json
@@ -0,0 +1,2 @@
+touch letsencrypt/acme.json
+chmod 600 letsencrypt/acme.json
diff --git a/backend/.gitignore b/backend/.gitignore
index 63f67bcd21..101092a3ec 100644
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -5,4 +5,4 @@ app.egg-info
.coverage
htmlcov
.cache
-.venv
+.venv
\ No newline at end of file
diff --git a/backend/app/alembic/versions/.keep b/backend/6a0826f924e8,
old mode 100755
new mode 100644
similarity index 100%
rename from backend/app/alembic/versions/.keep
rename to backend/6a0826f924e8,
diff --git a/backend/Dockerfile b/backend/Dockerfile
index c3187aeb28..57fa537edd 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -26,3 +26,5 @@ COPY ./prestart.sh /app/
COPY ./tests-start.sh /app/
COPY ./app /app/app
+
+RUN poetry run pip list
\ No newline at end of file
diff --git a/backend/README.md b/backend/README.md
index 7e7829677f..cb82724abf 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -17,8 +17,6 @@ docker compose up -d
Frontend, built with Docker, with routes handled based on the path: http://localhost
-Backend, JSON based web API based on OpenAPI: http://localhost/api/
-
Automatic interactive documentation with Swagger UI (from the OpenAPI backend): http://localhost/docs
Adminer, database web administration: http://localhost:8080
@@ -97,110 +95,104 @@ and then `exec` inside the running container:
$ docker compose exec backend bash
```
-You should see an output like:
-
-```console
-root@7f2607af31c3:/app#
-```
-
that means that you are in a `bash` session inside your container, as a `root` user, under the `/app` directory, this directory has another directory called "app" inside, that's where your code lives inside the container: `/app/app`.
-There you can use the script `/start-reload.sh` to run the debug live reloading server. You can run that script from inside the container with:
-
-```console
-$ bash /start-reload.sh
-```
-
-...it will look like:
-
-```console
-root@7f2607af31c3:/app# bash /start-reload.sh
-```
-
-and then hit enter. That runs the live reloading server that auto reloads when it detects code changes.
-
-Nevertheless, if it doesn't detect a change but a syntax error, it will just stop with an error. But as the container is still alive and you are in a Bash session, you can quickly restart it after fixing the error, running the same command ("up arrow" and "Enter").
-
-...this previous detail is what makes it useful to have the container alive doing nothing and then, in a Bash session, make it run the live reload server.
-
-### Backend tests
-
-To test the backend run:
-
-```console
-$ bash ./scripts/test.sh
-```
-
-The tests run with Pytest, modify and add tests to `./backend/app/tests/`.
-
-If you use GitHub Actions the tests will run automatically.
-
-#### Test running stack
-
-If your stack is already up and you just want to run the tests, you can use:
-
-```bash
-docker compose exec backend bash /app/tests-start.sh
-```
-
-That `/app/tests-start.sh` script just calls `pytest` after making sure that the rest of the stack is running. If you need to pass extra arguments to `pytest`, you can pass them to that command and they will be forwarded.
-
-For example, to stop on first error:
-
-```bash
-docker compose exec backend bash /app/tests-start.sh -x
-```
-
-#### Test Coverage
-
-When the tests are run, a file `htmlcov/index.html` is generated, you can open it in your browser to see the coverage of the tests.
-
### Migrations
-As during local development your app directory is mounted as a volume inside the container, you can also run the migrations with `alembic` commands inside the container and the migration code will be in your app directory (instead of being only inside the container). So you can add it to your git repository.
-
-Make sure you create a "revision" of your models and that you "upgrade" your database with that revision every time you change them. As this is what will update the tables in your database. Otherwise, your application will have errors.
-
-* Start an interactive session in the backend container:
-
-```console
-$ docker compose exec backend bash
-```
-
-* Alembic is already configured to import your SQLModel models from `./backend/app/models.py`.
+Make sure you create a "revision" of your models and upgrade your database with that revision every time you change them. This updates your database schema to reflect model changes and prevents application errors.
-* After changing a model (for example, adding a column), inside the container, create a revision, e.g.:
+#### Steps to Perform Migration
-```console
-$ alembic revision --autogenerate -m "Add column last_name to User model"
-```
-
-* Commit to the git repository the files generated in the alembic directory.
-
-* After creating the revision, run the migration in the database (this is what will actually change the database):
-
-```console
-$ alembic upgrade head
-```
+1. **Start an Interactive Session:**
+ Open a shell inside the backend container:
+ ```bash
+ docker compose exec backend bash
+ ```
-If you don't want to use migrations at all, uncomment the lines in the file at `./backend/app/core/db.py` that end in:
+2. **Generate a New Migration Revision:**
+ Automatically create a new migration based on your model changes:
+ ```bash
+ alembic revision --autogenerate -m "Describe your schema changes"
+ ```
-```python
-SQLModel.metadata.create_all(engine)
-```
-
-and comment the line in the file `prestart.sh` that contains:
+3. **Review the Migration Script:**
+ Check the generated migration file in the migrations directory to confirm the changes. Modify the migration file if necessary.
-```console
-$ alembic upgrade head
-```
+4. **Apply the Migration:**
+ Run the migration to update your database schema:
+ ```bash
+ alembic upgrade head
+ ```
-If you don't want to start with the default models and want to remove them / modify them, from the beginning, without having any previous revision, you can remove the revision files (`.py` Python files) under `./backend/app/alembic/versions/`. And then create a first migration as described above.
+5. **Verify the Update:**
+ Ensure that your database reflects the changes by reviewing logs or using a database client.
-## Email Templates
-
-The email templates are in `./backend/app/email-templates/`. Here, there are two directories: `build` and `src`. The `src` directory contains the source files that are used to build the final email templates. The `build` directory contains the final email templates that are used by the application.
-
-Before continuing, ensure you have the [MJML extension](https://marketplace.visualstudio.com/items?itemName=attilabuti.vscode-mjml) installed in your VS Code.
+* Start an interactive session in the backend container:
-Once you have the MJML extension installed, you can create a new email template in the `src` directory. After creating the new email template and with the `.mjml` file open in your editor, open the command palette with `Ctrl+Shift+P` and search for `MJML: Export to HTML`. This will convert the `.mjml` file to a `.html` file and now you can save it in the build directory.
+## Additional Backend Documentation
+
+### Project Structure
+
+- **app/**
+ - **api/**: Contains the RESTful API endpoint definitions using FastAPI. Each module here relates to a specific resource by:
+ - Defining route paths for HTTP methods (GET, POST, PUT, DELETE).
+ - Validating input data using Pydantic models.
+ - Handling exceptions and returning standardized JSON responses compliant with OpenAPI.
+ - **models.py**: Contains the SQLModel-based database models that define:
+ - The table schema including columns, data types, and constraints.
+ - Relationships between tables along with validation rules and default values.
+ **Note:** Always generate a new Alembic migration and upgrade your database after modifying this file.
+ - **crud.py**: Implements a set of CRUD functions that abstract database interactions, including:
+ - Creating and inserting new records.
+ - Fetching single or multiple records.
+ - Updating records with new data.
+ - Deleting records with robust error handling.
+- **Docker Setup**
+ - `docker-compose.yml` & `docker-compose.override.yml`: Used to start the entire stack for development. The volume mappings allow live reloading of code changes.
+ - `.dockerignore`: Lists files and directories that are not needed during the Docker build process.
+- **Version Control**
+ - `.gitignore`: Ensures that generated files (like caches, virtual environments, etc.) are not committed to version control.
+
+### Development Workflow
+
+- **Dependency management:** Uses [Poetry](https://python-poetry.org/) to handle dependencies and virtual environments.
+- **Running the application:** Start the services with:
+ ```bash
+ docker compose up -d
+ ```
+ Then, for local development and debugging, you can attach to the backend container using:
+ ```bash
+ docker compose exec backend bash
+ ```
+- **Migrations:** Use Alembic for database schema migrations. Always update your migration scripts when modifying models.
+- **Debugging & Testing:** Leverage the VS Code configurations to set breakpoints and run tests directly from the editor.
+
+### Extending the Application
+
+- **Adding New APIs:** When creating new endpoints, add a new module under the `app/api/` directory. Each endpoint should:
+ - Define RESTful routes implementing the required CRUD functionalities.
+ - Use dependency injection to handle authentication and request validation.
+ - Return structured responses according to OpenAPI standards.
+- **Modifying Data Models:** When altering `app/models.py`:
+ - Update table schemas, add or modify columns, and adjust relationships.
+ - Create and apply a corresponding Alembic migration to keep the database schema synchronized.
+
+This section is intended to serve as a high-level guide for both new and experienced developers on understanding and extending the backend of this FastAPI project.
+
+## Modules Overview
+
+### Schema
+
+The `app/schema/` directory contains Pydantic models that are responsible for:
+ - **Data Structure Definition:** Outlining the data formats used for API requests and responses.
+ - **Validation & Serialization:** Enforcing business logic and ensuring that incoming and outgoing data adhere to expected formats. For example, custom validators (such as in `carousel_poster.py`) ensure that specific business rules are followed.
+ - **ORM Integration:** Converting ORM objects into serializable formats using the `from_attributes = True` configuration.
+
+### Core
+
+The `app/core/` directory includes essential modules that form the backbone of the application:
+ - **config.py:** Manages application configuration and environment variables using Pydantic's BaseSettings. It also constructs derived settings (like the SQLAlchemy database URI and server host).
+ - **db.py:** Initializes and provides access to the database engine and sessions, ensuring smooth database connectivity and supporting operations like database initialization.
+ - **security.py:** Implements security measures such as JWT-based token creation and validation, ensuring secure API operations.
+
+These modules together ensure a modular, secure, and maintainable backend system.
\ No newline at end of file
diff --git a/backend/app/alembic/env.py b/backend/app/alembic/env.py
index 7f29c04680..ddab70f856 100755
--- a/backend/app/alembic/env.py
+++ b/backend/app/alembic/env.py
@@ -22,7 +22,7 @@
from app.core.config import settings # noqa
target_metadata = SQLModel.metadata
-
+print("target_metadata in env:", SQLModel.metadata.tables)
# other values from the config, defined by the needs of env.py,
# can be acquired:
# my_important_option = config.get_main_option("my_important_option")
@@ -78,7 +78,7 @@ def run_migrations_online():
context.run_migrations()
-if context.is_offline_mode():
- run_migrations_offline()
-else:
- run_migrations_online()
+# if context.is_offline_mode():
+# run_migrations_offline()
+# else:
+run_migrations_online()
diff --git a/backend/app/alembic/versions/15b7e49466ec_your_new_changes.py b/backend/app/alembic/versions/15b7e49466ec_your_new_changes.py
new file mode 100644
index 0000000000..532f52e1b3
--- /dev/null
+++ b/backend/app/alembic/versions/15b7e49466ec_your_new_changes.py
@@ -0,0 +1,29 @@
+"""your_new_changes
+
+Revision ID: 15b7e49466ec
+Revises: 6a0826f924e8
+Create Date: 2025-02-06 12:56:25.950098
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = '15b7e49466ec'
+down_revision = '6a0826f924e8'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ pass
+ # ### end Alembic commands ###
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ pass
+ # ### end Alembic commands ###
diff --git a/backend/app/alembic/versions/1a31ce608336_add_cascade_delete_relationships.py b/backend/app/alembic/versions/1a31ce608336_add_cascade_delete_relationships.py
deleted file mode 100644
index 10e47a1456..0000000000
--- a/backend/app/alembic/versions/1a31ce608336_add_cascade_delete_relationships.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""Add cascade delete relationships
-
-Revision ID: 1a31ce608336
-Revises: d98dd8ec85a3
-Create Date: 2024-07-31 22:24:34.447891
-
-"""
-from alembic import op
-import sqlalchemy as sa
-import sqlmodel.sql.sqltypes
-
-
-# revision identifiers, used by Alembic.
-revision = '1a31ce608336'
-down_revision = 'd98dd8ec85a3'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
- # ### commands auto generated by Alembic - please adjust! ###
- op.alter_column('item', 'owner_id',
- existing_type=sa.UUID(),
- nullable=False)
- op.drop_constraint('item_owner_id_fkey', 'item', type_='foreignkey')
- op.create_foreign_key(None, 'item', 'user', ['owner_id'], ['id'], ondelete='CASCADE')
- # ### end Alembic commands ###
-
-
-def downgrade():
- # ### commands auto generated by Alembic - please adjust! ###
- op.drop_constraint(None, 'item', type_='foreignkey')
- op.create_foreign_key('item_owner_id_fkey', 'item', 'user', ['owner_id'], ['id'])
- op.alter_column('item', 'owner_id',
- existing_type=sa.UUID(),
- nullable=True)
- # ### end Alembic commands ###
diff --git a/backend/app/alembic/versions/20cc9e9039fd_create_qr_codes_table.py b/backend/app/alembic/versions/20cc9e9039fd_create_qr_codes_table.py
new file mode 100644
index 0000000000..1ec5e79bcc
--- /dev/null
+++ b/backend/app/alembic/versions/20cc9e9039fd_create_qr_codes_table.py
@@ -0,0 +1,29 @@
+"""Create qrcode table
+
+Revision ID: 20cc9e9039fd
+Revises: 91f6f2bc36a4
+Create Date: 2024-11-01 10:17:32.083891
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = '20cc9e9039fd'
+down_revision = '91f6f2bc36a4'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ pass
+ # ### end Alembic commands ###
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ pass
+ # ### end Alembic commands ###
diff --git a/backend/app/alembic/versions/3078d16ee962_add_explicit_uservenueassociation_for_.py b/backend/app/alembic/versions/3078d16ee962_add_explicit_uservenueassociation_for_.py
new file mode 100644
index 0000000000..1e37e4bab3
--- /dev/null
+++ b/backend/app/alembic/versions/3078d16ee962_add_explicit_uservenueassociation_for_.py
@@ -0,0 +1,31 @@
+"""Add explicit UserVenueAssociation for UserBusiness and Venue
+
+Revision ID: 3078d16ee962
+Revises: 8c693686becd
+Create Date: 2024-10-24 14:55:49.010006
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = '3078d16ee962'
+down_revision = '8c693686becd'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.add_column('user_venue_association', sa.Column('id', sa.Uuid(), nullable=False))
+ op.add_column('user_venue_association', sa.Column('role', sqlmodel.sql.sqltypes.AutoString(), nullable=True))
+ # ### end Alembic commands ###
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.drop_column('user_venue_association', 'role')
+ op.drop_column('user_venue_association', 'id')
+ # ### end Alembic commands ###
diff --git a/backend/app/alembic/versions/4951a24acf4c_make_phone_number_nullable_in_user_.py b/backend/app/alembic/versions/4951a24acf4c_make_phone_number_nullable_in_user_.py
new file mode 100644
index 0000000000..b5d6bc57bd
--- /dev/null
+++ b/backend/app/alembic/versions/4951a24acf4c_make_phone_number_nullable_in_user_.py
@@ -0,0 +1,51 @@
+"""Make phone_number nullable in user_business
+
+Revision ID: 4951a24acf4c
+Revises: e2955dcf9b00
+Create Date: 2024-10-26 15:19:32.622093
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = '4951a24acf4c'
+down_revision = 'e2955dcf9b00'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.alter_column('user_business', 'email',
+ existing_type=sa.VARCHAR(length=255),
+ nullable=False)
+ op.alter_column('user_business', 'phone_number',
+ existing_type=sa.VARCHAR(),
+ nullable=True)
+ op.drop_index('ix_user_business_phone_number', table_name='user_business')
+ op.drop_index('ix_user_public_email', table_name='user_public')
+ op.add_column('user_venue_association', sa.Column('user_id', sa.Uuid(), nullable=False))
+ op.drop_constraint('user_venue_association_user_business_id_fkey', 'user_venue_association', type_='foreignkey')
+ op.create_foreign_key(None, 'user_venue_association', 'user_business', ['user_id'], ['id'])
+ op.drop_column('user_venue_association', 'user_business_id')
+ # ### end Alembic commands ###
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.add_column('user_venue_association', sa.Column('user_business_id', sa.UUID(), autoincrement=False, nullable=False))
+ op.drop_constraint(None, 'user_venue_association', type_='foreignkey')
+ op.create_foreign_key('user_venue_association_user_business_id_fkey', 'user_venue_association', 'user_business', ['user_business_id'], ['id'])
+ op.drop_column('user_venue_association', 'user_id')
+ op.create_index('ix_user_public_email', 'user_public', ['email'], unique=True)
+ op.create_index('ix_user_business_phone_number', 'user_business', ['phone_number'], unique=True)
+ op.alter_column('user_business', 'phone_number',
+ existing_type=sa.VARCHAR(),
+ nullable=False)
+ op.alter_column('user_business', 'email',
+ existing_type=sa.VARCHAR(length=255),
+ nullable=True)
+ # ### end Alembic commands ###
diff --git a/backend/app/alembic/versions/6a0826f924e8_create_carousel_poster_table.py b/backend/app/alembic/versions/6a0826f924e8_create_carousel_poster_table.py
new file mode 100644
index 0000000000..5e0a00d968
--- /dev/null
+++ b/backend/app/alembic/versions/6a0826f924e8_create_carousel_poster_table.py
@@ -0,0 +1,66 @@
+"""Create carousel_poster table
+
+Revision ID: 6a0826f924e8
+Revises: bc0a875f3f51
+Create Date: 2024-11-01 22:48:54.989213
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = '6a0826f924e8'
+down_revision = 'bc0a875f3f51'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.create_table('carousel_poster',
+ sa.Column('created_at', sa.DateTime(), nullable=False),
+ sa.Column('updated_at', sa.DateTime(), nullable=False),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('h3_index', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('image_url', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('deep_link', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('expires_at', sa.DateTime(), nullable=False),
+ sa.Column('event_id', sa.Uuid(), nullable=True),
+ sa.Column('venue_id', sa.Uuid(), nullable=True),
+ sa.ForeignKeyConstraint(['event_id'], ['event.id'], ),
+ sa.ForeignKeyConstraint(['venue_id'], ['venue.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_carousel_poster_h3_index'), 'carousel_poster', ['h3_index'], unique=False)
+ op.create_index(op.f('ix_carousel_poster_id'), 'carousel_poster', ['id'], unique=False)
+ op.add_column('event', sa.Column('venue_id', sa.Uuid(), nullable=False))
+ op.drop_constraint('event_nightclub_id_fkey', 'event', type_='foreignkey')
+ op.create_foreign_key(None, 'event', 'venue', ['venue_id'], ['id'])
+ op.drop_column('event', 'nightclub_id')
+ op.alter_column('venue', 'latitude',
+ existing_type=sa.DOUBLE_PRECISION(precision=53),
+ nullable=False)
+ op.alter_column('venue', 'longitude',
+ existing_type=sa.DOUBLE_PRECISION(precision=53),
+ nullable=False)
+ # ### end Alembic commands ###
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.alter_column('venue', 'longitude',
+ existing_type=sa.DOUBLE_PRECISION(precision=53),
+ nullable=True)
+ op.alter_column('venue', 'latitude',
+ existing_type=sa.DOUBLE_PRECISION(precision=53),
+ nullable=True)
+ op.add_column('event', sa.Column('nightclub_id', sa.UUID(), autoincrement=False, nullable=False))
+ op.drop_constraint(None, 'event', type_='foreignkey')
+ op.create_foreign_key('event_nightclub_id_fkey', 'event', 'nightclub', ['nightclub_id'], ['id'])
+ op.drop_column('event', 'venue_id')
+ op.drop_index(op.f('ix_carousel_poster_id'), table_name='carousel_poster')
+ op.drop_index(op.f('ix_carousel_poster_h3_index'), table_name='carousel_poster')
+ op.drop_table('carousel_poster')
+ # ### end Alembic commands ###
diff --git a/backend/app/alembic/versions/7fd1b196213e_initial_migration.py b/backend/app/alembic/versions/7fd1b196213e_initial_migration.py
new file mode 100644
index 0000000000..0565126562
--- /dev/null
+++ b/backend/app/alembic/versions/7fd1b196213e_initial_migration.py
@@ -0,0 +1,486 @@
+"""Initial migration
+
+Revision ID: 7fd1b196213e
+Revises:
+Create Date: 2024-10-23 17:54:34.693255
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = '7fd1b196213e'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.create_table('user_business',
+ sa.Column('created_at', sa.DateTime(), nullable=False),
+ sa.Column('updated_at', sa.DateTime(), nullable=False),
+ sa.Column('email', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=True),
+ sa.Column('phone_number', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('is_active', sa.Boolean(), nullable=False),
+ sa.Column('is_superuser', sa.Boolean(), nullable=False),
+ sa.Column('full_name', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=True),
+ sa.Column('refresh_token', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('registration_date', sa.DateTime(), nullable=False),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_user_business_email'), 'user_business', ['email'], unique=True)
+ op.create_index(op.f('ix_user_business_id'), 'user_business', ['id'], unique=False)
+ op.create_index(op.f('ix_user_business_phone_number'), 'user_business', ['phone_number'], unique=True)
+ op.create_table('user_public',
+ sa.Column('created_at', sa.DateTime(), nullable=False),
+ sa.Column('updated_at', sa.DateTime(), nullable=False),
+ sa.Column('email', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=True),
+ sa.Column('phone_number', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('is_active', sa.Boolean(), nullable=False),
+ sa.Column('is_superuser', sa.Boolean(), nullable=False),
+ sa.Column('full_name', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=True),
+ sa.Column('refresh_token', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('date_of_birth', sa.DateTime(), nullable=True),
+ sa.Column('gender', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('registration_date', sa.DateTime(), nullable=False),
+ sa.Column('profile_picture', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('preferences', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_user_public_email'), 'user_public', ['email'], unique=True)
+ op.create_index(op.f('ix_user_public_id'), 'user_public', ['id'], unique=False)
+ op.create_index(op.f('ix_user_public_phone_number'), 'user_public', ['phone_number'], unique=True)
+ op.create_table('venue',
+ sa.Column('created_at', sa.DateTime(), nullable=False),
+ sa.Column('updated_at', sa.DateTime(), nullable=False),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('address', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('latitude', sa.Float(), nullable=True),
+ sa.Column('longitude', sa.Float(), nullable=True),
+ sa.Column('capacity', sa.Integer(), nullable=True),
+ sa.Column('description', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('google_rating', sa.Float(), nullable=True),
+ sa.Column('instagram_handle', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('instagram_token', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('google_map_link', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('mobile_number', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('email', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('opening_time', sa.Time(), nullable=True),
+ sa.Column('closing_time', sa.Time(), nullable=True),
+ sa.Column('avg_expense_for_two', sa.Float(), nullable=True),
+ sa.Column('zomato_link', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('swiggy_link', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_venue_id'), 'venue', ['id'], unique=False)
+ op.create_index(op.f('ix_venue_name'), 'venue', ['name'], unique=False)
+ op.create_table('foodcourt',
+ sa.Column('created_at', sa.DateTime(), nullable=False),
+ sa.Column('updated_at', sa.DateTime(), nullable=False),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('total_qsrs', sa.Integer(), nullable=True),
+ sa.Column('seating_capacity', sa.Integer(), nullable=True),
+ sa.Column('venue_id', sa.Uuid(), nullable=False),
+ sa.ForeignKeyConstraint(['venue_id'], ['venue.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_foodcourt_id'), 'foodcourt', ['id'], unique=False)
+ op.create_index(op.f('ix_foodcourt_venue_id'), 'foodcourt', ['venue_id'], unique=False)
+ op.create_table('menu',
+ sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('description', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('menu_type', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('venue_id', sa.Uuid(), nullable=False),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.ForeignKeyConstraint(['venue_id'], ['venue.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_menu_id'), 'menu', ['id'], unique=False)
+ op.create_table('nightclub',
+ sa.Column('created_at', sa.DateTime(), nullable=False),
+ sa.Column('updated_at', sa.DateTime(), nullable=False),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('venue_id', sa.Uuid(), nullable=False),
+ sa.ForeignKeyConstraint(['venue_id'], ['venue.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_nightclub_id'), 'nightclub', ['id'], unique=False)
+ op.create_index(op.f('ix_nightclub_venue_id'), 'nightclub', ['venue_id'], unique=False)
+ op.create_table('payment_source_nightclub',
+ sa.Column('user_id', sa.Uuid(), nullable=False),
+ sa.Column('source_type', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('gateway_transaction_id', sa.Uuid(), nullable=True),
+ sa.Column('payment_time', sa.DateTime(), nullable=False),
+ sa.Column('amount', sa.Float(), nullable=False),
+ sa.Column('status', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('retry_count', sa.Integer(), nullable=False),
+ sa.Column('last_attempt_time', sa.DateTime(), nullable=True),
+ sa.ForeignKeyConstraint(['user_id'], ['user_public.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_payment_source_nightclub_id'), 'payment_source_nightclub', ['id'], unique=False)
+ op.create_table('payment_source_qsr',
+ sa.Column('user_id', sa.Uuid(), nullable=False),
+ sa.Column('source_type', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('gateway_transaction_id', sa.Uuid(), nullable=True),
+ sa.Column('payment_time', sa.DateTime(), nullable=False),
+ sa.Column('amount', sa.Float(), nullable=False),
+ sa.Column('status', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('retry_count', sa.Integer(), nullable=False),
+ sa.Column('last_attempt_time', sa.DateTime(), nullable=True),
+ sa.ForeignKeyConstraint(['user_id'], ['user_public.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_payment_source_qsr_id'), 'payment_source_qsr', ['id'], unique=False)
+ op.create_table('payment_source_restaurant',
+ sa.Column('user_id', sa.Uuid(), nullable=False),
+ sa.Column('source_type', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('gateway_transaction_id', sa.Uuid(), nullable=True),
+ sa.Column('payment_time', sa.DateTime(), nullable=False),
+ sa.Column('amount', sa.Float(), nullable=False),
+ sa.Column('status', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('retry_count', sa.Integer(), nullable=False),
+ sa.Column('last_attempt_time', sa.DateTime(), nullable=True),
+ sa.ForeignKeyConstraint(['user_id'], ['user_public.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_payment_source_restaurant_id'), 'payment_source_restaurant', ['id'], unique=False)
+ op.create_table('pickup_location',
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('venue_id', sa.Uuid(), nullable=False),
+ sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('description', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.ForeignKeyConstraint(['venue_id'], ['venue.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_pickup_location_id'), 'pickup_location', ['id'], unique=False)
+ op.create_table('restaurant',
+ sa.Column('created_at', sa.DateTime(), nullable=False),
+ sa.Column('updated_at', sa.DateTime(), nullable=False),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('venue_id', sa.Uuid(), nullable=False),
+ sa.Column('cuisine_type', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.ForeignKeyConstraint(['venue_id'], ['venue.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_restaurant_id'), 'restaurant', ['id'], unique=False)
+ op.create_index(op.f('ix_restaurant_venue_id'), 'restaurant', ['venue_id'], unique=False)
+ op.create_table('user_venue_association',
+ sa.Column('user_business_id', sa.Uuid(), nullable=False),
+ sa.Column('venue_id', sa.Uuid(), nullable=False),
+ sa.ForeignKeyConstraint(['user_business_id'], ['user_business.id'], ),
+ sa.ForeignKeyConstraint(['venue_id'], ['venue.id'], ),
+ sa.PrimaryKeyConstraint('user_business_id', 'venue_id')
+ )
+ op.create_table('event',
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('nightclub_id', sa.Uuid(), nullable=False),
+ sa.Column('title', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('start_time', sa.DateTime(), nullable=False),
+ sa.Column('end_time', sa.DateTime(), nullable=False),
+ sa.Column('image_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('age_restriction', sa.Integer(), nullable=True),
+ sa.Column('dress_code', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.ForeignKeyConstraint(['nightclub_id'], ['nightclub.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_event_id'), 'event', ['id'], unique=False)
+ op.create_table('group',
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('nightclub_id', sa.Uuid(), nullable=True),
+ sa.Column('created_at', sa.DateTime(), nullable=False),
+ sa.Column('admin_user_id', sa.Uuid(), nullable=False),
+ sa.Column('table_number', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.ForeignKeyConstraint(['admin_user_id'], ['user_public.id'], ),
+ sa.ForeignKeyConstraint(['nightclub_id'], ['nightclub.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_group_id'), 'group', ['id'], unique=False)
+ op.create_table('menu_category',
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('menu_id', sa.Uuid(), nullable=False),
+ sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.ForeignKeyConstraint(['menu_id'], ['menu.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_menu_category_id'), 'menu_category', ['id'], unique=False)
+ op.create_table('nightclub_order',
+ sa.Column('user_id', sa.Uuid(), nullable=False),
+ sa.Column('note', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('order_time', sa.DateTime(), nullable=False),
+ sa.Column('total_amount', sa.Float(), nullable=False),
+ sa.Column('taxes_and_charges', sa.Float(), nullable=True),
+ sa.Column('cover_charge_used', sa.Float(), nullable=True),
+ sa.Column('status', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('service_type', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('venue_id', sa.Uuid(), nullable=True),
+ sa.Column('payment_id', sa.Uuid(), nullable=True),
+ sa.Column('pickup_location_id', sa.Uuid(), nullable=True),
+ sa.ForeignKeyConstraint(['payment_id'], ['payment_source_nightclub.id'], ),
+ sa.ForeignKeyConstraint(['pickup_location_id'], ['pickup_location.id'], ),
+ sa.ForeignKeyConstraint(['user_id'], ['user_public.id'], ),
+ sa.ForeignKeyConstraint(['venue_id'], ['nightclub.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_nightclub_order_id'), 'nightclub_order', ['id'], unique=False)
+ op.create_table('qsr',
+ sa.Column('created_at', sa.DateTime(), nullable=False),
+ sa.Column('updated_at', sa.DateTime(), nullable=False),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('foodcourt_id', sa.Uuid(), nullable=True),
+ sa.Column('drive_thru', sa.Boolean(), nullable=True),
+ sa.Column('venue_id', sa.Uuid(), nullable=False),
+ sa.ForeignKeyConstraint(['foodcourt_id'], ['foodcourt.id'], ),
+ sa.ForeignKeyConstraint(['venue_id'], ['venue.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_qsr_foodcourt_id'), 'qsr', ['foodcourt_id'], unique=False)
+ op.create_index(op.f('ix_qsr_id'), 'qsr', ['id'], unique=False)
+ op.create_index(op.f('ix_qsr_venue_id'), 'qsr', ['venue_id'], unique=False)
+ op.create_table('restaurant_order',
+ sa.Column('user_id', sa.Uuid(), nullable=False),
+ sa.Column('pickup_location_id', sa.Uuid(), nullable=True),
+ sa.Column('note', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('order_time', sa.DateTime(), nullable=False),
+ sa.Column('total_amount', sa.Float(), nullable=False),
+ sa.Column('taxes_and_charges', sa.Float(), nullable=True),
+ sa.Column('cover_charge_used', sa.Float(), nullable=True),
+ sa.Column('status', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('service_type', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('venue_id', sa.Uuid(), nullable=True),
+ sa.Column('payment_id', sa.Uuid(), nullable=True),
+ sa.ForeignKeyConstraint(['payment_id'], ['payment_source_restaurant.id'], ),
+ sa.ForeignKeyConstraint(['pickup_location_id'], ['pickup_location.id'], ),
+ sa.ForeignKeyConstraint(['user_id'], ['user_public.id'], ),
+ sa.ForeignKeyConstraint(['venue_id'], ['restaurant.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_restaurant_order_id'), 'restaurant_order', ['id'], unique=False)
+ op.create_table('clubvisit',
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('user_id', sa.Uuid(), nullable=False),
+ sa.Column('group_id', sa.Uuid(), nullable=True),
+ sa.Column('nightclub_id', sa.Uuid(), nullable=False),
+ sa.Column('entry_time', sa.DateTime(), nullable=False),
+ sa.Column('exit_time', sa.DateTime(), nullable=True),
+ sa.Column('cover_charge', sa.Float(), nullable=True),
+ sa.Column('total_bill', sa.Float(), nullable=True),
+ sa.ForeignKeyConstraint(['group_id'], ['group.id'], ),
+ sa.ForeignKeyConstraint(['nightclub_id'], ['nightclub.id'], ),
+ sa.ForeignKeyConstraint(['user_id'], ['user_public.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_table('event_booking',
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('user_id', sa.Uuid(), nullable=False),
+ sa.Column('event_id', sa.Uuid(), nullable=False),
+ sa.Column('booking_time', sa.DateTime(), nullable=False),
+ sa.Column('total_amount', sa.Float(), nullable=False),
+ sa.Column('status', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.ForeignKeyConstraint(['event_id'], ['event.id'], ),
+ sa.ForeignKeyConstraint(['user_id'], ['user_public.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_table('group_nightclub_order_link',
+ sa.Column('group_id', sa.Uuid(), nullable=False),
+ sa.Column('nightclub_order_id', sa.Uuid(), nullable=False),
+ sa.ForeignKeyConstraint(['group_id'], ['group.id'], ),
+ sa.ForeignKeyConstraint(['nightclub_order_id'], ['nightclub_order.id'], ),
+ sa.PrimaryKeyConstraint('group_id', 'nightclub_order_id')
+ )
+ op.create_table('group_wallet',
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('group_id', sa.Uuid(), nullable=False),
+ sa.Column('balance', sa.Float(), nullable=False),
+ sa.ForeignKeyConstraint(['group_id'], ['group.id'], ),
+ sa.PrimaryKeyConstraint('id'),
+ sa.UniqueConstraint('group_id')
+ )
+ op.create_index(op.f('ix_group_wallet_id'), 'group_wallet', ['id'], unique=False)
+ op.create_table('groupmembers',
+ sa.Column('group_id', sa.Uuid(), nullable=False),
+ sa.Column('user_id', sa.Uuid(), nullable=False),
+ sa.ForeignKeyConstraint(['group_id'], ['group.id'], ),
+ sa.ForeignKeyConstraint(['user_id'], ['user_public.id'], ),
+ sa.PrimaryKeyConstraint('group_id', 'user_id')
+ )
+ op.create_table('menu_sub_category',
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('category_id', sa.Uuid(), nullable=False),
+ sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.ForeignKeyConstraint(['category_id'], ['menu_category.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_menu_sub_category_id'), 'menu_sub_category', ['id'], unique=False)
+ op.create_table('qsr_order',
+ sa.Column('user_id', sa.Uuid(), nullable=False),
+ sa.Column('pickup_location_id', sa.Uuid(), nullable=True),
+ sa.Column('note', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('order_time', sa.DateTime(), nullable=False),
+ sa.Column('total_amount', sa.Float(), nullable=False),
+ sa.Column('taxes_and_charges', sa.Float(), nullable=True),
+ sa.Column('cover_charge_used', sa.Float(), nullable=True),
+ sa.Column('status', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('service_type', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('venue_id', sa.Uuid(), nullable=False),
+ sa.Column('payment_id', sa.Uuid(), nullable=False),
+ sa.ForeignKeyConstraint(['payment_id'], ['payment_source_qsr.id'], ),
+ sa.ForeignKeyConstraint(['pickup_location_id'], ['pickup_location.id'], ),
+ sa.ForeignKeyConstraint(['user_id'], ['user_public.id'], ),
+ sa.ForeignKeyConstraint(['venue_id'], ['qsr.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_qsr_order_id'), 'qsr_order', ['id'], unique=False)
+ op.create_table('event_offering',
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('event_id', sa.Uuid(), nullable=False),
+ sa.Column('event_booking_id', sa.Uuid(), nullable=False),
+ sa.Column('offering_type', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('description', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('price', sa.Float(), nullable=False),
+ sa.Column('total_guests_per_pass', sa.Integer(), nullable=False),
+ sa.Column('cover_charge', sa.Float(), nullable=True),
+ sa.Column('additional_charges', sa.Float(), nullable=True),
+ sa.Column('availability', sa.Integer(), nullable=False),
+ sa.ForeignKeyConstraint(['event_booking_id'], ['event_booking.id'], ),
+ sa.ForeignKeyConstraint(['event_id'], ['event.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_event_offering_id'), 'event_offering', ['id'], unique=False)
+ op.create_table('groupwallettopup',
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('group_wallet_id', sa.Uuid(), nullable=False),
+ sa.Column('amount', sa.Float(), nullable=False),
+ sa.Column('topup_time', sa.DateTime(), nullable=False),
+ sa.ForeignKeyConstraint(['group_wallet_id'], ['group_wallet.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_groupwallettopup_id'), 'groupwallettopup', ['id'], unique=False)
+ op.create_table('menu_item',
+ sa.Column('category_id', sa.Uuid(), nullable=False),
+ sa.Column('sub_category_id', sa.Uuid(), nullable=True),
+ sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('price', sa.Float(), nullable=False),
+ sa.Column('description', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('image_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('is_veg', sa.Boolean(), nullable=True),
+ sa.Column('ingredients', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.Column('abv', sa.Float(), nullable=True),
+ sa.Column('ibu', sa.Integer(), nullable=True),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.ForeignKeyConstraint(['category_id'], ['menu_category.id'], ),
+ sa.ForeignKeyConstraint(['sub_category_id'], ['menu_sub_category.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_menu_item_id'), 'menu_item', ['id'], unique=False)
+ op.create_table('payment_event',
+ sa.Column('user_id', sa.Uuid(), nullable=False),
+ sa.Column('source_type', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('gateway_transaction_id', sa.Uuid(), nullable=True),
+ sa.Column('payment_time', sa.DateTime(), nullable=False),
+ sa.Column('amount', sa.Float(), nullable=False),
+ sa.Column('status', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('event_booking_id', sa.Uuid(), nullable=True),
+ sa.ForeignKeyConstraint(['event_booking_id'], ['event_booking.id'], ),
+ sa.ForeignKeyConstraint(['user_id'], ['user_public.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_payment_event_id'), 'payment_event', ['id'], unique=False)
+ op.create_table('orderitem',
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('nightclub_order_id', sa.Uuid(), nullable=True),
+ sa.Column('restaurant_order_id', sa.Uuid(), nullable=True),
+ sa.Column('qsr_order_id', sa.Uuid(), nullable=True),
+ sa.Column('item_id', sa.Uuid(), nullable=False),
+ sa.Column('quantity', sa.Integer(), nullable=False),
+ sa.ForeignKeyConstraint(['item_id'], ['menu_item.id'], ),
+ sa.ForeignKeyConstraint(['nightclub_order_id'], ['nightclub_order.id'], ),
+ sa.ForeignKeyConstraint(['qsr_order_id'], ['qsr_order.id'], ),
+ sa.ForeignKeyConstraint(['restaurant_order_id'], ['restaurant_order.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_orderitem_id'), 'orderitem', ['id'], unique=False)
+ # ### end Alembic commands ###
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.drop_index(op.f('ix_orderitem_id'), table_name='orderitem')
+ op.drop_table('orderitem')
+ op.drop_index(op.f('ix_payment_event_id'), table_name='payment_event')
+ op.drop_table('payment_event')
+ op.drop_index(op.f('ix_menu_item_id'), table_name='menu_item')
+ op.drop_table('menu_item')
+ op.drop_index(op.f('ix_groupwallettopup_id'), table_name='groupwallettopup')
+ op.drop_table('groupwallettopup')
+ op.drop_index(op.f('ix_event_offering_id'), table_name='event_offering')
+ op.drop_table('event_offering')
+ op.drop_index(op.f('ix_qsr_order_id'), table_name='qsr_order')
+ op.drop_table('qsr_order')
+ op.drop_index(op.f('ix_menu_sub_category_id'), table_name='menu_sub_category')
+ op.drop_table('menu_sub_category')
+ op.drop_table('groupmembers')
+ op.drop_index(op.f('ix_group_wallet_id'), table_name='group_wallet')
+ op.drop_table('group_wallet')
+ op.drop_table('group_nightclub_order_link')
+ op.drop_table('event_booking')
+ op.drop_table('clubvisit')
+ op.drop_index(op.f('ix_restaurant_order_id'), table_name='restaurant_order')
+ op.drop_table('restaurant_order')
+ op.drop_index(op.f('ix_qsr_venue_id'), table_name='qsr')
+ op.drop_index(op.f('ix_qsr_id'), table_name='qsr')
+ op.drop_index(op.f('ix_qsr_foodcourt_id'), table_name='qsr')
+ op.drop_table('qsr')
+ op.drop_index(op.f('ix_nightclub_order_id'), table_name='nightclub_order')
+ op.drop_table('nightclub_order')
+ op.drop_index(op.f('ix_menu_category_id'), table_name='menu_category')
+ op.drop_table('menu_category')
+ op.drop_index(op.f('ix_group_id'), table_name='group')
+ op.drop_table('group')
+ op.drop_index(op.f('ix_event_id'), table_name='event')
+ op.drop_table('event')
+ op.drop_table('user_venue_association')
+ op.drop_index(op.f('ix_restaurant_venue_id'), table_name='restaurant')
+ op.drop_index(op.f('ix_restaurant_id'), table_name='restaurant')
+ op.drop_table('restaurant')
+ op.drop_index(op.f('ix_pickup_location_id'), table_name='pickup_location')
+ op.drop_table('pickup_location')
+ op.drop_index(op.f('ix_payment_source_restaurant_id'), table_name='payment_source_restaurant')
+ op.drop_table('payment_source_restaurant')
+ op.drop_index(op.f('ix_payment_source_qsr_id'), table_name='payment_source_qsr')
+ op.drop_table('payment_source_qsr')
+ op.drop_index(op.f('ix_payment_source_nightclub_id'), table_name='payment_source_nightclub')
+ op.drop_table('payment_source_nightclub')
+ op.drop_index(op.f('ix_nightclub_venue_id'), table_name='nightclub')
+ op.drop_index(op.f('ix_nightclub_id'), table_name='nightclub')
+ op.drop_table('nightclub')
+ op.drop_index(op.f('ix_menu_id'), table_name='menu')
+ op.drop_table('menu')
+ op.drop_index(op.f('ix_foodcourt_venue_id'), table_name='foodcourt')
+ op.drop_index(op.f('ix_foodcourt_id'), table_name='foodcourt')
+ op.drop_table('foodcourt')
+ op.drop_index(op.f('ix_venue_name'), table_name='venue')
+ op.drop_index(op.f('ix_venue_id'), table_name='venue')
+ op.drop_table('venue')
+ op.drop_index(op.f('ix_user_public_phone_number'), table_name='user_public')
+ op.drop_index(op.f('ix_user_public_id'), table_name='user_public')
+ op.drop_index(op.f('ix_user_public_email'), table_name='user_public')
+ op.drop_table('user_public')
+ op.drop_index(op.f('ix_user_business_phone_number'), table_name='user_business')
+ op.drop_index(op.f('ix_user_business_id'), table_name='user_business')
+ op.drop_index(op.f('ix_user_business_email'), table_name='user_business')
+ op.drop_table('user_business')
+ # ### end Alembic commands ###
diff --git a/backend/app/alembic/versions/8c693686becd_description_of_changes.py b/backend/app/alembic/versions/8c693686becd_description_of_changes.py
new file mode 100644
index 0000000000..3b39fcda0e
--- /dev/null
+++ b/backend/app/alembic/versions/8c693686becd_description_of_changes.py
@@ -0,0 +1,37 @@
+"""Description of changes
+
+Revision ID: 8c693686becd
+Revises: 9e690425af2e
+Create Date: 2024-10-23 23:16:40.093380
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = '8c693686becd'
+down_revision = '9e690425af2e'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.add_column('nightclub', sa.Column('age_limit', sa.Integer(), nullable=True))
+ op.add_column('venue', sa.Column('zomato_link', sqlmodel.sql.sqltypes.AutoString(), nullable=True))
+ op.add_column('venue', sa.Column('swiggy_link', sqlmodel.sql.sqltypes.AutoString(), nullable=True))
+ op.drop_column('venue', 'swiggylink')
+ op.drop_column('venue', 'zomatolink')
+ # ### end Alembic commands ###
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.add_column('venue', sa.Column('zomatolink', sa.VARCHAR(), autoincrement=False, nullable=True))
+ op.add_column('venue', sa.Column('swiggylink', sa.VARCHAR(), autoincrement=False, nullable=True))
+ op.drop_column('venue', 'swiggy_link')
+ op.drop_column('venue', 'zomato_link')
+ op.drop_column('nightclub', 'age_limit')
+ # ### end Alembic commands ###
diff --git a/backend/app/alembic/versions/91f6f2bc36a4_add_registration_date_to_user_public.py b/backend/app/alembic/versions/91f6f2bc36a4_add_registration_date_to_user_public.py
new file mode 100644
index 0000000000..701da3f637
--- /dev/null
+++ b/backend/app/alembic/versions/91f6f2bc36a4_add_registration_date_to_user_public.py
@@ -0,0 +1,63 @@
+"""Add registration_date to user_public
+
+Revision ID: 91f6f2bc36a4
+Revises: 4951a24acf4c
+Create Date: 2024-10-30 21:14:14.300480
+
+"""
+from alembic import op
+from sqlalchemy.dialects.postgresql import ENUM
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '91f6f2bc36a4'
+down_revision = '4951a24acf4c'
+branch_labels = None
+depends_on = None
+
+gender_enum = ENUM('male', 'female', 'others', name='gender')
+
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ gender_enum.create(op.get_bind())
+ op.drop_table('carousel_poster')
+ op.drop_column('user_business', 'registration_date')
+ op.alter_column('user_public', 'gender',
+ type_=gender_enum,
+ existing_type=sa.String(), # Change to the existing type
+ existing_nullable=True,
+ postgresql_using='gender::gender') # If you need to convert existing data
+
+ op.drop_column('user_public', 'registration_date')
+ op.drop_column('venue', 'h3_index')
+ # ### end Alembic commands ###
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.add_column('venue', sa.Column('h3_index', sa.VARCHAR(), autoincrement=False, nullable=True))
+ op.add_column('user_public', sa.Column('registration_date', postgresql.TIMESTAMP(), autoincrement=False, nullable=False))
+ op.drop_column('user_public', 'gender')
+ gender_enum.drop(op.get_bind())
+ op.add_column('user_business', sa.Column('registration_date', postgresql.TIMESTAMP(), autoincrement=False, nullable=False))
+ op.create_table('carousel_poster',
+ sa.Column('id', sa.UUID(), server_default=sa.text('gen_random_uuid()'), autoincrement=False, nullable=False),
+ sa.Column('image_url', sa.VARCHAR(length=255), autoincrement=False, nullable=False),
+ sa.Column('deep_link', sa.VARCHAR(length=255), autoincrement=False, nullable=False),
+ sa.Column('expires_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=False),
+ sa.Column('event_id', sa.UUID(), autoincrement=False, nullable=True),
+ sa.Column('nightclub_id', sa.UUID(), autoincrement=False, nullable=True),
+ sa.Column('foodcourt_id', sa.UUID(), autoincrement=False, nullable=True),
+ sa.Column('qsr_id', sa.UUID(), autoincrement=False, nullable=True),
+ sa.Column('restaurant_id', sa.UUID(), autoincrement=False, nullable=True),
+ sa.Column('h3_index', sa.VARCHAR(length=255), autoincrement=False, nullable=False),
+ sa.ForeignKeyConstraint(['event_id'], ['event.id'], name='carousel_poster_event_id_fkey'),
+ sa.ForeignKeyConstraint(['foodcourt_id'], ['foodcourt.id'], name='carousel_poster_foodcourt_id_fkey'),
+ sa.ForeignKeyConstraint(['nightclub_id'], ['nightclub.id'], name='carousel_poster_nightclub_id_fkey'),
+ sa.ForeignKeyConstraint(['qsr_id'], ['qsr.id'], name='carousel_poster_qsr_id_fkey'),
+ sa.ForeignKeyConstraint(['restaurant_id'], ['restaurant.id'], name='carousel_poster_restaurant_id_fkey'),
+ sa.PrimaryKeyConstraint('id', name='carousel_poster_pkey')
+ )
+ # ### end Alembic commands ###
diff --git a/backend/app/alembic/versions/9c0a54914c78_add_max_length_for_string_varchar_.py b/backend/app/alembic/versions/9c0a54914c78_add_max_length_for_string_varchar_.py
deleted file mode 100755
index 78a41773b9..0000000000
--- a/backend/app/alembic/versions/9c0a54914c78_add_max_length_for_string_varchar_.py
+++ /dev/null
@@ -1,69 +0,0 @@
-"""Add max length for string(varchar) fields in User and Items models
-
-Revision ID: 9c0a54914c78
-Revises: e2412789c190
-Create Date: 2024-06-17 14:42:44.639457
-
-"""
-from alembic import op
-import sqlalchemy as sa
-import sqlmodel.sql.sqltypes
-
-
-# revision identifiers, used by Alembic.
-revision = '9c0a54914c78'
-down_revision = 'e2412789c190'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
- # Adjust the length of the email field in the User table
- op.alter_column('user', 'email',
- existing_type=sa.String(),
- type_=sa.String(length=255),
- existing_nullable=False)
-
- # Adjust the length of the full_name field in the User table
- op.alter_column('user', 'full_name',
- existing_type=sa.String(),
- type_=sa.String(length=255),
- existing_nullable=True)
-
- # Adjust the length of the title field in the Item table
- op.alter_column('item', 'title',
- existing_type=sa.String(),
- type_=sa.String(length=255),
- existing_nullable=False)
-
- # Adjust the length of the description field in the Item table
- op.alter_column('item', 'description',
- existing_type=sa.String(),
- type_=sa.String(length=255),
- existing_nullable=True)
-
-
-def downgrade():
- # Revert the length of the email field in the User table
- op.alter_column('user', 'email',
- existing_type=sa.String(length=255),
- type_=sa.String(),
- existing_nullable=False)
-
- # Revert the length of the full_name field in the User table
- op.alter_column('user', 'full_name',
- existing_type=sa.String(length=255),
- type_=sa.String(),
- existing_nullable=True)
-
- # Revert the length of the title field in the Item table
- op.alter_column('item', 'title',
- existing_type=sa.String(length=255),
- type_=sa.String(),
- existing_nullable=False)
-
- # Revert the length of the description field in the Item table
- op.alter_column('item', 'description',
- existing_type=sa.String(length=255),
- type_=sa.String(),
- existing_nullable=True)
diff --git a/backend/app/alembic/versions/9e690425af2e_add_zomato_link_to_venue.py b/backend/app/alembic/versions/9e690425af2e_add_zomato_link_to_venue.py
new file mode 100644
index 0000000000..0abc04de47
--- /dev/null
+++ b/backend/app/alembic/versions/9e690425af2e_add_zomato_link_to_venue.py
@@ -0,0 +1,25 @@
+"""add zomato_link to venue
+
+Revision ID: 9e690425af2e
+Revises: 7fd1b196213e
+Create Date: 2024-10-23 23:11:38.666505
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = '9e690425af2e'
+down_revision = '7fd1b196213e'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ pass
+
+
+def downgrade():
+ pass
diff --git a/backend/app/alembic/versions/a1c01df04ba4_create_qrcode_table.py b/backend/app/alembic/versions/a1c01df04ba4_create_qrcode_table.py
new file mode 100644
index 0000000000..c404b005de
--- /dev/null
+++ b/backend/app/alembic/versions/a1c01df04ba4_create_qrcode_table.py
@@ -0,0 +1,47 @@
+"""Create qrcode table
+
+Revision ID: a1c01df04ba4
+Revises: bef89635a1b9
+Create Date: 2024-11-01 13:29:27.200014
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'a1c01df04ba4'
+down_revision = 'bef89635a1b9'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.create_table('qrcode',
+ sa.Column('created_at', sa.DateTime(), nullable=False),
+ sa.Column('updated_at', sa.DateTime(), nullable=False),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('venue_id', sa.Uuid(), nullable=True),
+ sa.Column('table_number', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.ForeignKeyConstraint(['venue_id'], ['venue.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.drop_table('qr_codes')
+ # ### end Alembic commands ###
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.create_table('qr_codes',
+ sa.Column('created_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=False),
+ sa.Column('updated_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=False),
+ sa.Column('id', sa.UUID(), autoincrement=False, nullable=False),
+ sa.Column('venue_id', sa.UUID(), autoincrement=False, nullable=True),
+ sa.Column('table_number', sa.VARCHAR(), autoincrement=False, nullable=True),
+ sa.ForeignKeyConstraint(['venue_id'], ['venue.id'], name='qr_codes_venue_id_fkey'),
+ sa.PrimaryKeyConstraint('id', name='qr_codes_pkey')
+ )
+ op.drop_table('qrcode')
+ # ### end Alembic commands ###
diff --git a/backend/app/alembic/versions/bc0a875f3f51_make_latitude_and_longitude_not_nullable.py b/backend/app/alembic/versions/bc0a875f3f51_make_latitude_and_longitude_not_nullable.py
new file mode 100644
index 0000000000..200aca7380
--- /dev/null
+++ b/backend/app/alembic/versions/bc0a875f3f51_make_latitude_and_longitude_not_nullable.py
@@ -0,0 +1,25 @@
+"""Make latitude and longitude not nullable
+
+Revision ID: bc0a875f3f51
+Revises: a1c01df04ba4
+Create Date: 2024-11-01 22:45:19.154522
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = 'bc0a875f3f51'
+down_revision = 'a1c01df04ba4'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ pass
+
+
+def downgrade():
+ pass
diff --git a/backend/app/alembic/versions/bef89635a1b9_create_qr_codes_table.py b/backend/app/alembic/versions/bef89635a1b9_create_qr_codes_table.py
new file mode 100644
index 0000000000..c412895ff4
--- /dev/null
+++ b/backend/app/alembic/versions/bef89635a1b9_create_qr_codes_table.py
@@ -0,0 +1,37 @@
+"""Create qrcode table
+
+Revision ID: bef89635a1b9
+Revises: 20cc9e9039fd
+Create Date: 2024-11-01 10:26:05.045546
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = 'bef89635a1b9'
+down_revision = '20cc9e9039fd'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.create_table('qrcode',
+ sa.Column('created_at', sa.DateTime(), nullable=False),
+ sa.Column('updated_at', sa.DateTime(), nullable=False),
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('venue_id', sa.Uuid(), nullable=True),
+ sa.Column('table_number', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+ sa.ForeignKeyConstraint(['venue_id'], ['venue.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ # ### end Alembic commands ###
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.drop_table('qrcode')
+ # ### end Alembic commands ###
diff --git a/backend/app/alembic/versions/d98dd8ec85a3_edit_replace_id_integers_in_all_models_.py b/backend/app/alembic/versions/d98dd8ec85a3_edit_replace_id_integers_in_all_models_.py
deleted file mode 100755
index 37af1fa215..0000000000
--- a/backend/app/alembic/versions/d98dd8ec85a3_edit_replace_id_integers_in_all_models_.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""Edit replace id integers in all models to use UUID instead
-
-Revision ID: d98dd8ec85a3
-Revises: 9c0a54914c78
-Create Date: 2024-07-19 04:08:04.000976
-
-"""
-from alembic import op
-import sqlalchemy as sa
-import sqlmodel.sql.sqltypes
-from sqlalchemy.dialects import postgresql
-
-
-# revision identifiers, used by Alembic.
-revision = 'd98dd8ec85a3'
-down_revision = '9c0a54914c78'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
- # Ensure uuid-ossp extension is available
- op.execute('CREATE EXTENSION IF NOT EXISTS "uuid-ossp"')
-
- # Create a new UUID column with a default UUID value
- op.add_column('user', sa.Column('new_id', postgresql.UUID(as_uuid=True), default=sa.text('uuid_generate_v4()')))
- op.add_column('item', sa.Column('new_id', postgresql.UUID(as_uuid=True), default=sa.text('uuid_generate_v4()')))
- op.add_column('item', sa.Column('new_owner_id', postgresql.UUID(as_uuid=True), nullable=True))
-
- # Populate the new columns with UUIDs
- op.execute('UPDATE "user" SET new_id = uuid_generate_v4()')
- op.execute('UPDATE item SET new_id = uuid_generate_v4()')
- op.execute('UPDATE item SET new_owner_id = (SELECT new_id FROM "user" WHERE "user".id = item.owner_id)')
-
- # Set the new_id as not nullable
- op.alter_column('user', 'new_id', nullable=False)
- op.alter_column('item', 'new_id', nullable=False)
-
- # Drop old columns and rename new columns
- op.drop_constraint('item_owner_id_fkey', 'item', type_='foreignkey')
- op.drop_column('item', 'owner_id')
- op.alter_column('item', 'new_owner_id', new_column_name='owner_id')
-
- op.drop_column('user', 'id')
- op.alter_column('user', 'new_id', new_column_name='id')
-
- op.drop_column('item', 'id')
- op.alter_column('item', 'new_id', new_column_name='id')
-
- # Create primary key constraint
- op.create_primary_key('user_pkey', 'user', ['id'])
- op.create_primary_key('item_pkey', 'item', ['id'])
-
- # Recreate foreign key constraint
- op.create_foreign_key('item_owner_id_fkey', 'item', 'user', ['owner_id'], ['id'])
-
-def downgrade():
- # Reverse the upgrade process
- op.add_column('user', sa.Column('old_id', sa.Integer, autoincrement=True))
- op.add_column('item', sa.Column('old_id', sa.Integer, autoincrement=True))
- op.add_column('item', sa.Column('old_owner_id', sa.Integer, nullable=True))
-
- # Populate the old columns with default values
- # Generate sequences for the integer IDs if not exist
- op.execute('CREATE SEQUENCE IF NOT EXISTS user_id_seq AS INTEGER OWNED BY "user".old_id')
- op.execute('CREATE SEQUENCE IF NOT EXISTS item_id_seq AS INTEGER OWNED BY item.old_id')
-
- op.execute('SELECT setval(\'user_id_seq\', COALESCE((SELECT MAX(old_id) + 1 FROM "user"), 1), false)')
- op.execute('SELECT setval(\'item_id_seq\', COALESCE((SELECT MAX(old_id) + 1 FROM item), 1), false)')
-
- op.execute('UPDATE "user" SET old_id = nextval(\'user_id_seq\')')
- op.execute('UPDATE item SET old_id = nextval(\'item_id_seq\'), old_owner_id = (SELECT old_id FROM "user" WHERE "user".id = item.owner_id)')
-
- # Drop new columns and rename old columns back
- op.drop_constraint('item_owner_id_fkey', 'item', type_='foreignkey')
- op.drop_column('item', 'owner_id')
- op.alter_column('item', 'old_owner_id', new_column_name='owner_id')
-
- op.drop_column('user', 'id')
- op.alter_column('user', 'old_id', new_column_name='id')
-
- op.drop_column('item', 'id')
- op.alter_column('item', 'old_id', new_column_name='id')
-
- # Create primary key constraint
- op.create_primary_key('user_pkey', 'user', ['id'])
- op.create_primary_key('item_pkey', 'item', ['id'])
-
- # Recreate foreign key constraint
- op.create_foreign_key('item_owner_id_fkey', 'item', 'user', ['owner_id'], ['id'])
diff --git a/backend/app/alembic/versions/e2412789c190_initialize_models.py b/backend/app/alembic/versions/e2412789c190_initialize_models.py
deleted file mode 100644
index 7529ea91fa..0000000000
--- a/backend/app/alembic/versions/e2412789c190_initialize_models.py
+++ /dev/null
@@ -1,54 +0,0 @@
-"""Initialize models
-
-Revision ID: e2412789c190
-Revises:
-Create Date: 2023-11-24 22:55:43.195942
-
-"""
-import sqlalchemy as sa
-import sqlmodel.sql.sqltypes
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "e2412789c190"
-down_revision = None
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
- # ### commands auto generated by Alembic - please adjust! ###
- op.create_table(
- "user",
- sa.Column("email", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
- sa.Column("is_active", sa.Boolean(), nullable=False),
- sa.Column("is_superuser", sa.Boolean(), nullable=False),
- sa.Column("full_name", sqlmodel.sql.sqltypes.AutoString(), nullable=True),
- sa.Column("id", sa.Integer(), nullable=False),
- sa.Column(
- "hashed_password", sqlmodel.sql.sqltypes.AutoString(), nullable=False
- ),
- sa.PrimaryKeyConstraint("id"),
- )
- op.create_index(op.f("ix_user_email"), "user", ["email"], unique=True)
- op.create_table(
- "item",
- sa.Column("description", sqlmodel.sql.sqltypes.AutoString(), nullable=True),
- sa.Column("id", sa.Integer(), nullable=False),
- sa.Column("title", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
- sa.Column("owner_id", sa.Integer(), nullable=False),
- sa.ForeignKeyConstraint(
- ["owner_id"],
- ["user.id"],
- ),
- sa.PrimaryKeyConstraint("id"),
- )
- # ### end Alembic commands ###
-
-
-def downgrade():
- # ### commands auto generated by Alembic - please adjust! ###
- op.drop_table("item")
- op.drop_index(op.f("ix_user_email"), table_name="user")
- op.drop_table("user")
- # ### end Alembic commands ###
diff --git a/backend/app/alembic/versions/e2955dcf9b00_updated_menu_and_category_models.py b/backend/app/alembic/versions/e2955dcf9b00_updated_menu_and_category_models.py
new file mode 100644
index 0000000000..288f13039b
--- /dev/null
+++ b/backend/app/alembic/versions/e2955dcf9b00_updated_menu_and_category_models.py
@@ -0,0 +1,29 @@
+"""Updated menu and category models
+
+Revision ID: e2955dcf9b00
+Revises: ea33a3e76248
+Create Date: 2024-10-24 23:47:03.184543
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = 'e2955dcf9b00'
+down_revision = 'ea33a3e76248'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ pass
+ # ### end Alembic commands ###
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ pass
+ # ### end Alembic commands ###
diff --git a/backend/app/alembic/versions/ea33a3e76248_create_menu_subcategory_table.py b/backend/app/alembic/versions/ea33a3e76248_create_menu_subcategory_table.py
new file mode 100644
index 0000000000..12c6f31eee
--- /dev/null
+++ b/backend/app/alembic/versions/ea33a3e76248_create_menu_subcategory_table.py
@@ -0,0 +1,57 @@
+"""create menu_subcategory table
+
+Revision ID: ea33a3e76248
+Revises: 3078d16ee962
+Create Date: 2024-10-24 23:25:14.486071
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = 'ea33a3e76248'
+down_revision = '3078d16ee962'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.create_table('menu_subcategory',
+ sa.Column('id', sa.Uuid(), nullable=False),
+ sa.Column('category_id', sa.Uuid(), nullable=False),
+ sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+ sa.Column('is_alcoholic', sa.Boolean(), nullable=False),
+ sa.ForeignKeyConstraint(['category_id'], ['menu_category.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_index(op.f('ix_menu_subcategory_id'), 'menu_subcategory', ['id'], unique=False)
+ op.add_column('menu_item', sa.Column('subcategory_id', sa.Uuid(), nullable=False))
+ op.drop_constraint('menu_item_category_id_fkey', 'menu_item', type_='foreignkey')
+ op.create_foreign_key(None, 'menu_item', 'menu_subcategory', ['subcategory_id'], ['id'])
+ op.drop_column('menu_item', 'category_id')
+ op.drop_column('menu_item', 'sub_category_id')
+ # ### end Alembic commands ###
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.add_column('menu_item', sa.Column('sub_category_id', sa.UUID(), autoincrement=False, nullable=True))
+ op.add_column('menu_item', sa.Column('category_id', sa.UUID(), autoincrement=False, nullable=False))
+ op.drop_constraint(None, 'menu_item', type_='foreignkey')
+ op.create_foreign_key('menu_item_category_id_fkey', 'menu_item', 'menu_category', ['category_id'], ['id'])
+ op.create_foreign_key('menu_item_sub_category_id_fkey', 'menu_item', 'menu_sub_category', ['sub_category_id'], ['id'])
+ op.drop_column('menu_item', 'subcategory_id')
+ op.create_table('menu_sub_category',
+ sa.Column('id', sa.UUID(), autoincrement=False, nullable=False),
+ sa.Column('category_id', sa.UUID(), autoincrement=False, nullable=False),
+ sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False),
+ sa.ForeignKeyConstraint(['category_id'], ['menu_category.id'], name='menu_sub_category_category_id_fkey'),
+ sa.PrimaryKeyConstraint('id', name='menu_sub_category_pkey')
+ )
+ op.create_index('ix_menu_sub_category_id', 'menu_sub_category', ['id'], unique=False)
+ op.drop_index(op.f('ix_menu_subcategory_id'), table_name='menu_subcategory')
+ op.drop_table('menu_subcategory')
+ # ### end Alembic commands ###
diff --git a/backend/app/api/deps.py b/backend/app/api/deps.py
index c2b83c841d..57bfe25812 100644
--- a/backend/app/api/deps.py
+++ b/backend/app/api/deps.py
@@ -1,22 +1,19 @@
from collections.abc import Generator
from typing import Annotated
-import jwt
from fastapi import Depends, HTTPException, status
-from fastapi.security import OAuth2PasswordBearer
-from jwt.exceptions import InvalidTokenError
-from pydantic import ValidationError
-from sqlmodel import Session
+from fastapi.security import (
+ HTTPAuthorizationCredentials,
+ HTTPBearer,
+)
+from sqlalchemy.orm import Session
-from app.core import security
-from app.core.config import settings
from app.core.db import engine
-from app.models import TokenPayload, User
-
-reusable_oauth2 = OAuth2PasswordBearer(
- tokenUrl=f"{settings.API_V1_STR}/login/access-token"
-)
+from app.core.security import get_jwt_payload
+from app.models.user import UserBusiness, UserPublic
+# OAuth2PasswordBearer to extract the token from the request header
+bearer_scheme = HTTPBearer()
def get_db() -> Generator[Session, None, None]:
with Session(engine) as session:
@@ -24,34 +21,87 @@ def get_db() -> Generator[Session, None, None]:
SessionDep = Annotated[Session, Depends(get_db)]
-TokenDep = Annotated[str, Depends(reusable_oauth2)]
-
-def get_current_user(session: SessionDep, token: TokenDep) -> User:
+# Dependency to get the current user
+async def get_current_user(
+ credentials: Annotated[HTTPAuthorizationCredentials, Depends(bearer_scheme)],
+ session: SessionDep
+) -> UserPublic | UserBusiness:
+ # print('credentials.credentials ', credentials.credentials)
try:
- payload = jwt.decode(
- token, settings.SECRET_KEY, algorithms=[security.ALGORITHM]
- )
- token_data = TokenPayload(**payload)
- except (InvalidTokenError, ValidationError):
- raise HTTPException(
- status_code=status.HTTP_403_FORBIDDEN,
- detail="Could not validate credentials",
+ print('credentials.credentials ', credentials.credentials)
+ # Verify and decode the token (ensure this is as fast as possible)
+ token_data = get_jwt_payload(credentials.credentials)
+ user_id = token_data.sub
+ print('hhuuuser_id ', user_id)
+ # Query both user types in a single call, using a union if possible
+ user = (
+ session.query(UserPublic)
+ .filter(UserPublic.id == user_id)
+ .first()
+ ) or (
+ session.query(UserBusiness)
+ .filter(UserBusiness.id == user_id)
+ .first()
)
- user = session.get(User, token_data.sub)
- if not user:
- raise HTTPException(status_code=404, detail="User not found")
- if not user.is_active:
- raise HTTPException(status_code=400, detail="Inactive user")
- return user
+ # If no user is found or the user is inactive, raise an error
+ if not user:
+ raise HTTPException(
+ status_code=status.HTTP_404_NOT_FOUND,
+ detail="User not found",
+ )
+ if not user.is_active:
+ raise HTTPException(
+ status_code=status.HTTP_403_FORBIDDEN,
+ detail="Inactive user",
+ )
+
+ return user
-CurrentUser = Annotated[User, Depends(get_current_user)]
+ except Exception:
+ raise HTTPException(
+ status_code=status.HTTP_401_UNAUTHORIZED,
+ detail="Could not validate credentials"
+ )
+# Dependency to get the business user
+async def get_business_user(
+ credentials: Annotated[HTTPAuthorizationCredentials, Depends(bearer_scheme)],
+ session: SessionDep
+) -> UserBusiness:
+ current_user = await get_current_user(credentials, session)
+ if not isinstance(current_user, UserBusiness):
+ raise HTTPException(
+ status_code=status.HTTP_403_FORBIDDEN,
+ detail="Not a business user",
+ )
+ return current_user
-def get_current_active_superuser(current_user: CurrentUser) -> User:
+# Dependency to get the superuser
+async def get_super_user(
+ credentials: Annotated[HTTPAuthorizationCredentials, Depends(bearer_scheme)],
+ session: SessionDep
+) -> UserBusiness:
+ current_user = await get_business_user(credentials, session)
if not current_user.is_superuser:
raise HTTPException(
- status_code=403, detail="The user doesn't have enough privileges"
+ status_code=status.HTTP_403_FORBIDDEN,
+ detail="Not a superuser",
+ )
+ return current_user
+
+# Dependency to get any public user
+async def get_public_user(
+ credentials: Annotated[HTTPAuthorizationCredentials, Depends(bearer_scheme)],
+ session: SessionDep
+) -> UserPublic:
+ print('credentials.credentials ', credentials.credentials)
+ current_user = await get_current_user(credentials, session)
+ # print('current_user ', current_user)
+ if not isinstance(current_user, UserPublic):
+ raise HTTPException(
+ status_code=status.HTTP_403_FORBIDDEN,
+ detail="Not a public user",
)
return current_user
diff --git a/backend/app/api/main.py b/backend/app/api/main.py
index 09e0663fc3..71bd7cb7d2 100644
--- a/backend/app/api/main.py
+++ b/backend/app/api/main.py
@@ -1,9 +1,12 @@
from fastapi import APIRouter
-from app.api.routes import items, login, users, utils
+from app.api.routes import carousel, login, menu, qrcode, users, venues,scrapper
api_router = APIRouter()
+api_router.include_router(venues.router, prefix="/venue", tags=["venue"])
+api_router.include_router(menu.router, prefix="/menu", tags=["menu"])
+api_router.include_router(users.router, prefix="/user", tags=["user"])
api_router.include_router(login.router, tags=["login"])
-api_router.include_router(users.router, prefix="/users", tags=["users"])
-api_router.include_router(utils.router, prefix="/utils", tags=["utils"])
-api_router.include_router(items.router, prefix="/items", tags=["items"])
+api_router.include_router(qrcode.router, tags=["qrcode"])
+api_router.include_router(carousel.router, prefix="/carousel", tags=["carousel"])
+api_router.include_router(scrapper.router, prefix="/scrapper", tags=["scrapper"])
\ No newline at end of file
diff --git a/backend/app/api/routes/carousel.py b/backend/app/api/routes/carousel.py
new file mode 100644
index 0000000000..994a7a0063
--- /dev/null
+++ b/backend/app/api/routes/carousel.py
@@ -0,0 +1,102 @@
+from datetime import datetime
+
+import h3
+from fastapi import APIRouter, Depends, HTTPException
+from sqlmodel import Session, select
+
+from app.api.deps import SessionDep, get_business_user, get_current_user, get_db
+from app.models.carousel_poster import CarouselPoster
+from app.models.event import Event
+from app.models.user import UserBusiness, UserPublic
+from app.models.venue import Venue
+from app.schema.carousel_poster import CarouselPosterCreate, CarouselPosterRead
+from app.util import check_user_permission, create_record, get_record_by_id
+from app.utils import get_h3_index
+
+router = APIRouter()
+
+
+@router.get("/poster/", response_model=list[CarouselPosterRead])
+async def get_carousel_posters(
+ latitude: float,
+ longitude: float,
+ session: SessionDep,
+ radius: int = 3000,
+ current_user: UserPublic = Depends(get_current_user), # noqa: ARG001
+):
+ user_h3_index = get_h3_index(latitude=latitude, longitude=longitude)
+
+ distance_in_km = radius / 1000
+ k_ring_size = int(distance_in_km / 1.2)
+
+ nearby_h3_indexes = h3.k_ring(user_h3_index, k_ring_size)
+
+ posters = (
+ session.execute(
+ select(CarouselPoster)
+ .where(CarouselPoster.h3_index.in_(nearby_h3_indexes))
+ .where(CarouselPoster.expires_at > datetime.now())
+ )
+ .scalars()
+ .all()
+ )
+
+ return [poster.to_read_schema() for poster in posters]
+
+
+@router.post("/poster/", response_model=CarouselPosterRead)
+async def create_carousel_poster(
+ poster: CarouselPosterCreate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_business_user),
+):
+ print("Creating carousel poster, poster: ", poster)
+ poster_instance = CarouselPoster.from_create_schema(poster)
+ print("Creating carousel poster, poster_instance: ", poster_instance)
+ venue = None
+ if poster_instance.venue_id:
+ print("Creating carousel poster, venue_id: ", poster_instance.venue_id)
+ try:
+ venue = get_record_by_id(db, Venue, poster_instance.venue_id)
+ except Exception:
+ raise HTTPException(status_code=404, detail="Venue not found")
+ print("Creating carousel poster, venue: ", venue)
+ elif poster_instance.event_id:
+ try:
+ event = db.get(poster_instance.event_id, Event)
+ except Exception:
+ raise HTTPException(status_code=404, detail="Event not found")
+ venue = event.venue
+ else:
+ raise ValueError("Either event_id or venue_id must be provided")
+
+ check_user_permission(db, current_user, venue.id)
+
+ h3_index = get_h3_index(
+ latitude=venue.latitude, longitude=venue.longitude, resolution=9
+ )
+
+ poster_instance.h3_index = h3_index
+
+ created_poster = create_record(db, poster_instance)
+
+ assert isinstance(
+ created_poster, CarouselPoster
+ ), "The returned object is not of type CarouselPoster"
+
+ x = created_poster.to_read_schema()
+ return x
+
+
+# @router.put("/poster/{poster_id}", response_model=CarouselPosterRead)
+# async def update_carousel_poster(
+# poster_id: uuid.UUID, updated_data: CarouselPosterCreate, session: SessionDep
+# ):
+# return update_record(
+# session=session, record_id=poster_id, obj_in=updated_data, model=CarouselPoster
+# )
+
+
+# @router.delete("/poster/{poster_id}")
+# async def delete_carousel_poster(poster_id: uuid.UUID, session: SessionDep):
+# return delete_record(session=session, model=CarouselPoster, record_id=poster_id)
diff --git a/backend/app/api/routes/items.py b/backend/app/api/routes/items.py
deleted file mode 100644
index 67196c2366..0000000000
--- a/backend/app/api/routes/items.py
+++ /dev/null
@@ -1,109 +0,0 @@
-import uuid
-from typing import Any
-
-from fastapi import APIRouter, HTTPException
-from sqlmodel import func, select
-
-from app.api.deps import CurrentUser, SessionDep
-from app.models import Item, ItemCreate, ItemPublic, ItemsPublic, ItemUpdate, Message
-
-router = APIRouter()
-
-
-@router.get("/", response_model=ItemsPublic)
-def read_items(
- session: SessionDep, current_user: CurrentUser, skip: int = 0, limit: int = 100
-) -> Any:
- """
- Retrieve items.
- """
-
- if current_user.is_superuser:
- count_statement = select(func.count()).select_from(Item)
- count = session.exec(count_statement).one()
- statement = select(Item).offset(skip).limit(limit)
- items = session.exec(statement).all()
- else:
- count_statement = (
- select(func.count())
- .select_from(Item)
- .where(Item.owner_id == current_user.id)
- )
- count = session.exec(count_statement).one()
- statement = (
- select(Item)
- .where(Item.owner_id == current_user.id)
- .offset(skip)
- .limit(limit)
- )
- items = session.exec(statement).all()
-
- return ItemsPublic(data=items, count=count)
-
-
-@router.get("/{id}", response_model=ItemPublic)
-def read_item(session: SessionDep, current_user: CurrentUser, id: uuid.UUID) -> Any:
- """
- Get item by ID.
- """
- item = session.get(Item, id)
- if not item:
- raise HTTPException(status_code=404, detail="Item not found")
- if not current_user.is_superuser and (item.owner_id != current_user.id):
- raise HTTPException(status_code=400, detail="Not enough permissions")
- return item
-
-
-@router.post("/", response_model=ItemPublic)
-def create_item(
- *, session: SessionDep, current_user: CurrentUser, item_in: ItemCreate
-) -> Any:
- """
- Create new item.
- """
- item = Item.model_validate(item_in, update={"owner_id": current_user.id})
- session.add(item)
- session.commit()
- session.refresh(item)
- return item
-
-
-@router.put("/{id}", response_model=ItemPublic)
-def update_item(
- *,
- session: SessionDep,
- current_user: CurrentUser,
- id: uuid.UUID,
- item_in: ItemUpdate,
-) -> Any:
- """
- Update an item.
- """
- item = session.get(Item, id)
- if not item:
- raise HTTPException(status_code=404, detail="Item not found")
- if not current_user.is_superuser and (item.owner_id != current_user.id):
- raise HTTPException(status_code=400, detail="Not enough permissions")
- update_dict = item_in.model_dump(exclude_unset=True)
- item.sqlmodel_update(update_dict)
- session.add(item)
- session.commit()
- session.refresh(item)
- return item
-
-
-@router.delete("/{id}")
-def delete_item(
- session: SessionDep, current_user: CurrentUser, id: uuid.UUID
-) -> Message:
- """
- Delete an item.
- """
- item = session.get(Item, id)
- if not item:
- raise HTTPException(status_code=404, detail="Item not found")
- if not current_user.is_superuser and (item.owner_id != current_user.id):
- raise HTTPException(status_code=400, detail="Not enough permissions")
- session.delete(item)
- session.commit()
- return Message(message="Item deleted successfully")
diff --git a/backend/app/api/routes/login.py b/backend/app/api/routes/login.py
index fe7e94d5c1..643515827b 100644
--- a/backend/app/api/routes/login.py
+++ b/backend/app/api/routes/login.py
@@ -1,124 +1,182 @@
-from datetime import timedelta
-from typing import Annotated, Any
+import hashlib
+from datetime import datetime, timedelta, timezone
+from typing import Annotated
from fastapi import APIRouter, Depends, HTTPException
-from fastapi.responses import HTMLResponse
-from fastapi.security import OAuth2PasswordRequestForm
-
-from app import crud
-from app.api.deps import CurrentUser, SessionDep, get_current_active_superuser
-from app.core import security
-from app.core.config import settings
-from app.core.security import get_password_hash
-from app.models import Message, NewPassword, Token, UserPublic
-from app.utils import (
- generate_password_reset_token,
- generate_reset_password_email,
- send_email,
- verify_password_reset_token,
+
+from app.api.deps import SessionDep, get_current_user
+from app.core.security import ( # Adjust the import based on your structure
+ create_access_token,
+ create_refresh_token,
+ get_jwt_payload,
)
+from app.models.auth import OtplessToken, RefreshTokenPayload, UserAuthResponse
+from app.models.user import UserBusiness, UserPublic # Import your UserPublic model
router = APIRouter()
-@router.post("/login/access-token")
-def login_access_token(
- session: SessionDep, form_data: Annotated[OAuth2PasswordRequestForm, Depends()]
-) -> Token:
- """
- OAuth2 compatible token login, get an access token for future requests
- """
- user = crud.authenticate(
- session=session, email=form_data.username, password=form_data.password
- )
- if not user:
- raise HTTPException(status_code=400, detail="Incorrect email or password")
- elif not user.is_active:
- raise HTTPException(status_code=400, detail="Inactive user")
- access_token_expires = timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
- return Token(
- access_token=security.create_access_token(
- user.id, expires_delta=access_token_expires
+def generate_number_from_string(s):
+ return int(hashlib.sha256(s.encode()).hexdigest(), 16) % 10 ** 8
+
+
+@router.post("/verify_token/business", response_model=UserAuthResponse)
+async def business_user_google_login(request: OtplessToken, session: SessionDep):
+ try:
+ # Verify the Google token with Google
+ # token_info_url = "https://oauth2.googleapis.com/tokeninfo"
+ # async with httpx.AsyncClient() as client:
+ # response = await client.get(f"{token_info_url}?id_token={request.google_token}")
+
+ # if response.status_code != 200:
+ # raise HTTPException(status_code=400, detail="Invalid Google token")
+
+ # # Parse user info
+ # user_info = response.json()
+ # email = user_info.get("email")
+ # user_id = user_info.get("sub") # Google user ID
+
+ # Check for user by Google ID or email
+ email = request.otpless_token+ "test@gmail.com" # Replace this with the actual email from the SDK response
+ user = session.query(UserBusiness).filter(UserBusiness.email == email).first()
+
+ if not user:
+ # Create new user if not found
+ user = UserBusiness(
+ email=email,
+ is_active=True
+ )
+ session.add(user)
+ session.commit()
+ session.refresh(user)
+
+ # Create tokens
+ access_token = create_access_token(subject=str(user.id), expires_delta=timedelta(minutes=30))
+ refresh_token = create_refresh_token(subject=str(user.id))
+
+ # Store refresh token
+ user.refresh_token = refresh_token.token
+ session.add(user)
+ session.commit()
+
+ return UserAuthResponse(
+ access_token=access_token,
+ refresh_token=refresh_token,
+ issued_at=datetime.now(timezone.utc)
+ )
+
+ except Exception as e:
+ raise HTTPException(status_code=400, detail=str(e))
+
+@router.post("/verify_token/public", response_model=UserAuthResponse)
+async def verify_token(request: OtplessToken, session: SessionDep):
+ try:
+ # Verify the token using OTPLess SDK
+ # Uncomment and implement token verification with OTPLess
+ # user_details = OTPLessAuthSDK.UserDetail.verify_token(
+ # request.otpless_token,
+ # settings.CLIENT_ID,
+ # settings.CLIENT_SECRET
+ # )
+
+ # Simulated user details for demonstration
+ # phone_number = "8130181469" # Replace this with the actual phone number from the SDK response
+ phone_number = str(generate_number_from_string(request.otpless_token))
+
+ # Check for the user by phone number
+ user = session.query(UserPublic).filter(UserPublic.phone_number == phone_number).first()
+
+ if not user:
+ # Create a new user if not found
+ user = UserPublic(
+ phone_number=phone_number,
+ is_active=True
+ )
+ session.add(user)
+ session.commit()
+ session.refresh(user)
+
+ # Create tokens
+ access_token = create_access_token(subject=str(user.id), expires_delta=timedelta(minutes=30))
+ refresh_token = create_refresh_token(subject=str(user.id))
+
+ # Store the new refresh token in the user's record
+ user.refresh_token = refresh_token.token
+ session.add(user) # Add the updated user to the session
+ session.commit() # Commit the changes to the database
+
+ return UserAuthResponse(
+ access_token=access_token,
+ refresh_token=refresh_token,
+ issued_at=datetime.now(timezone.utc)
)
- )
+ except Exception as e:
+ raise HTTPException(status_code=400, detail=str(e))
-@router.post("/login/test-token", response_model=UserPublic)
-def test_token(current_user: CurrentUser) -> Any:
- """
- Test access token
- """
- return current_user
+@router.post("/refresh_token", response_model=UserAuthResponse)
+async def refresh_token(request: RefreshTokenPayload, session: SessionDep):
+ try:
+ # Decode and validate the refresh token payload
+ payload = get_jwt_payload(request.refresh_token)
-@router.post("/password-recovery/{email}")
-def recover_password(email: str, session: SessionDep) -> Message:
- """
- Password Recovery
- """
- user = crud.get_user_by_email(session=session, email=email)
+ # Extract the user ID (sub) from the payload
+ user_id = payload.sub
- if not user:
- raise HTTPException(
- status_code=404,
- detail="The user with this email does not exist in the system.",
- )
- password_reset_token = generate_password_reset_token(email=email)
- email_data = generate_reset_password_email(
- email_to=user.email, email=email, token=password_reset_token
- )
- send_email(
- email_to=user.email,
- subject=email_data.subject,
- html_content=email_data.html_content,
- )
- return Message(message="Password recovery email sent")
-
-
-@router.post("/reset-password/")
-def reset_password(session: SessionDep, body: NewPassword) -> Message:
- """
- Reset password
- """
- email = verify_password_reset_token(token=body.token)
- if not email:
- raise HTTPException(status_code=400, detail="Invalid token")
- user = crud.get_user_by_email(session=session, email=email)
- if not user:
- raise HTTPException(
- status_code=404,
- detail="The user with this email does not exist in the system.",
+ # Fetch the user from the database using the user ID
+ user = (
+ session.query(UserPublic)
+ .filter(UserPublic.id == user_id)
+ .first()
+ ) or (
+ session.query(UserBusiness)
+ .filter(UserBusiness.id == user_id)
+ .first()
)
- elif not user.is_active:
- raise HTTPException(status_code=400, detail="Inactive user")
- hashed_password = get_password_hash(password=body.new_password)
- user.hashed_password = hashed_password
- session.add(user)
- session.commit()
- return Message(message="Password updated successfully")
-
-
-@router.post(
- "/password-recovery-html-content/{email}",
- dependencies=[Depends(get_current_active_superuser)],
- response_class=HTMLResponse,
-)
-def recover_password_html_content(email: str, session: SessionDep) -> Any:
- """
- HTML Content for Password Recovery
- """
- user = crud.get_user_by_email(session=session, email=email)
-
- if not user:
- raise HTTPException(
- status_code=404,
- detail="The user with this username does not exist in the system.",
+
+ if not user:
+ raise HTTPException(status_code=404, detail="User not found")
+
+ # Verify if the refresh token in the database matches the provided token
+ if user.refresh_token != request.refresh_token:
+ raise HTTPException(status_code=401, detail="Invalid refresh token")
+
+ # Check if the token has expired
+ current_time = datetime.now(timezone.utc)
+ if payload.exp and datetime.fromtimestamp(payload.exp, timezone.utc) < current_time:
+ raise HTTPException(status_code=401, detail="Refresh token expired")
+
+ # If valid, generate new tokens
+ new_access_token = create_access_token(subject=user_id, expires_delta=timedelta(minutes=30))
+ new_refresh_token = create_refresh_token(subject=user_id)
+
+ # Update the user's refresh token in the database
+ user.refresh_token = new_refresh_token.token
+ session.add(user)
+ session.commit()
+
+ # Return the new tokens and issue time
+ return UserAuthResponse(
+ access_token=new_access_token,
+ refresh_token=new_refresh_token,
+ issued_at=current_time
)
- password_reset_token = generate_password_reset_token(email=email)
- email_data = generate_reset_password_email(
- email_to=user.email, email=email, token=password_reset_token
- )
-
- return HTMLResponse(
- content=email_data.html_content, headers={"subject:": email_data.subject}
- )
+
+ except Exception as e:
+ raise HTTPException(status_code=400, detail=str(e))
+
+@router.get("/logout")
+async def logout(
+ session: SessionDep,
+ current_user: Annotated[UserPublic | UserBusiness, Depends(get_current_user)]):
+ try:
+ # Invalidate the refresh token by setting it to None or an empty string
+ current_user.refresh_token = None
+ session.add(current_user)
+ session.commit()
+
+ return {"message": "Logout successful, refresh token invalidated"}
+
+ except Exception as e:
+ raise HTTPException(status_code=400, detail=str(e))
diff --git a/backend/app/api/routes/menu.py b/backend/app/api/routes/menu.py
new file mode 100644
index 0000000000..f845b7f7a1
--- /dev/null
+++ b/backend/app/api/routes/menu.py
@@ -0,0 +1,440 @@
+import uuid
+
+from fastapi import APIRouter, Depends, HTTPException
+from sqlmodel import Session, select
+
+from app.api.deps import get_current_user, get_db
+from app.models.menu import Menu, MenuCategory, MenuItem, MenuSubCategory
+from app.models.user import UserBusiness, UserPublic
+from app.models.venue import Venue
+from app.schema.menu import (
+ MenuCategoryCreate,
+ MenuCategoryRead,
+ MenuCategoryUpdate,
+ MenuCreate,
+ MenuItemCreate,
+ MenuItemRead,
+ MenuItemUpdate,
+ MenuRead,
+ MenuSubCategoryCreate,
+ MenuSubCategoryRead,
+ MenuSubCategoryUpdate,
+ MenuUpdate,
+)
+from app.util import (
+ check_user_permission,
+ create_record,
+ delete_record,
+ get_record_by_id,
+ update_record,
+)
+
+router = APIRouter()
+
+
+# Get all menus of a specific venue
+@router.get("/all/{venue_id}", response_model=list[MenuRead])
+async def read_menus(
+ venue_id: uuid.UUID,
+ db: Session = Depends(get_db),
+ current_user: UserPublic = Depends(get_current_user), # noqa: ARG001
+):
+ """
+ Retrieve all menus for a specific venue.
+ """
+ # Query the Menu table for menus associated with the specified venue
+ statement = select(Menu).where(Menu.venue_id == venue_id)
+ menus = db.execute(statement).scalars().all() # Execute the query
+
+ if not menus:
+ raise HTTPException(status_code=404, detail="No menus found for this venue.")
+
+ assert isinstance(menus[0], Menu), "Fetched Menu object is not of type Menu"
+
+ return [menu.to_read_schema() for menu in menus]
+
+
+@router.get("/menu/{menu_id}", response_model=MenuRead)
+async def read_menu(
+ menu_id: uuid.UUID,
+ db: Session = Depends(get_db),
+ current_user: UserPublic = Depends(get_current_user), # noqa: ARG001
+):
+ """
+ Retrieve a specific menu by its ID.
+ """
+ menu = get_record_by_id(db, Menu, menu_id)
+
+ assert isinstance(menu, Menu), "The returned object is not of type Menu"
+ return menu.to_read_schema()
+
+
+@router.post("/", response_model=MenuRead)
+async def create_menu(
+ menu_create: MenuCreate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Create a new menu for a specific venue.
+ """
+ # Check if the venue exists
+ venue = get_record_by_id(db, Venue, menu_create.venue_id)
+ if not venue:
+ raise HTTPException(status_code=404, detail="Venue not found.")
+
+ # Check if the user has permission to create a menu for this venue
+ check_user_permission(db, current_user, menu_create.venue_id)
+
+ try:
+ # Create the Menu object
+ menu_instance = Menu.from_create_schema(menu_create)
+
+ # Use the create_record helper to save the menu to the database
+ created_menu = create_record(db, menu_instance)
+
+ assert isinstance(created_menu, Menu), "The returned object is not of type Menu"
+ return created_menu.to_read_schema()
+
+ except Exception as e:
+ db.rollback() # Rollback in case of error
+ raise HTTPException(status_code=400, detail=f"Error creating menu: {str(e)}")
+
+
+@router.patch("/{menu_id}", response_model=MenuRead)
+async def update_menu(
+ menu_id: uuid.UUID,
+ menu_update: MenuUpdate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Update an existing menu's details using a partial update (PATCH).
+
+ :param menu_id: The ID of the menu to update.
+ :param menu_update: The fields to update, provided as a Pydantic model.
+ :param db: Active database session.
+ :return: The updated Menu as a response.
+ """
+ # Retrieve the menu by its ID
+ menu_instance = get_record_by_id(db, Menu, menu_id)
+ # Check if the user has permission to update a menu for this venue
+
+ if not menu_instance:
+ raise HTTPException(status_code=404, detail="Menu not found.")
+
+ check_user_permission(db, current_user, menu_instance.venue_id)
+
+ # Update the menu using the validated fields from MenuUpdate
+ updated_menu = update_record(db, menu_instance, menu_update)
+ assert isinstance(updated_menu, Menu), "The returned object is not of type Menu"
+ return updated_menu.to_read_schema()
+
+
+@router.delete("/{menu_id}", response_model=dict)
+async def delete_menu(
+ menu_id: uuid.UUID,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Delete a menu by its ID.
+
+ :param menu_id: The ID of the menu to delete.
+ :param db: Active database session.
+ :return: Confirmation message on successful deletion.
+ """
+ menu_instance = get_record_by_id(db, Menu, menu_id)
+ if not menu_instance:
+ raise HTTPException(status_code=404, detail="Menu not found.")
+
+ # Check if the user has permission to delete a menu for this venue
+ check_user_permission(db, current_user, menu_instance.venue_id)
+
+ delete_record(db, menu_instance)
+
+ return {"detail": "Menu deleted successfully."}
+
+
+##############################################################################################################
+
+
+@router.post("/category", response_model=MenuCategoryRead)
+async def create_menu_category(
+ category_create: MenuCategoryCreate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Create a new menu category associated with a menu.
+
+ :param category_create: The details for the new menu category, provided as a Pydantic model.
+ :param db: Active database session.
+ :return: The created MenuCategory as a response.
+ """
+ # Check if the menu exists
+ menu = get_record_by_id(db, Menu, category_create.menu_id)
+
+ if not menu:
+ raise HTTPException(status_code=404, detail="Menu not found.")
+ # Check if the user has permission to update a menu for this venue
+ check_user_permission(db, current_user, menu.venue_id)
+
+ # Create a new MenuCategory instance from the provided data
+ category_instance = MenuCategory.from_create_schema(category_create)
+
+ # Persist the new category in the database
+ created_category = create_record(db, category_instance)
+
+ assert isinstance(
+ created_category, MenuCategory
+ ), "The returned object is not of type MenuCategory"
+ return created_category.to_read_schema()
+
+
+@router.patch("/category/{category_id}", response_model=MenuCategoryRead)
+async def update_menu_category(
+ category_id: uuid.UUID,
+ category_update: MenuCategoryUpdate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Update an existing menu category's details using a partial update (PATCH).
+
+ :param category_id: The ID of the menu category to update.
+ :param category_update: The fields to update, provided as a Pydantic model.
+ :param db: Active database session.
+ :return: The updated MenuCategory as a response.
+ """
+ # Retrieve the category by its ID
+ category_instance = get_record_by_id(db, MenuCategory, category_id)
+
+ if not category_instance:
+ raise HTTPException(status_code=404, detail="Menu category not found.")
+
+ check_user_permission(db, current_user, category_instance.menu.venue_id)
+
+ # Update the category using the validated fields from MenuCategoryUpdate
+ updated_category = update_record(db, category_instance, category_update)
+
+ assert isinstance(
+ updated_category, MenuCategory
+ ), "The returned object is not of type MenuCategory"
+ return updated_category.to_read_schema()
+
+
+@router.delete("/category/{category_id}", response_model=dict)
+async def delete_category(
+ category_id: uuid.UUID,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Delete a menu category by its ID.
+
+ :param category_id: The ID of the category to delete.
+ :param db: Active database session.
+ :return: Confirmation message on successful deletion.
+ """
+ category = get_record_by_id(db, MenuCategory, category_id)
+
+ if not category:
+ raise HTTPException(status_code=404, detail="Category not found.")
+
+ check_user_permission(db, current_user, category.menu.venue_id)
+
+ delete_record(db, category)
+
+ return {"detail": "Category deleted successfully."}
+
+
+##############################################################################################################
+
+
+@router.post("/subcategory/", response_model=MenuSubCategoryRead)
+async def create_menu_subcategory(
+ subcategory_create: MenuSubCategoryCreate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Create a new menu subcategory associated with a category.
+
+ :param subcategory_create: The details for the new menu subcategory, provided as a Pydantic model.
+ :param db: Active database session.
+ :return: The created MenuSubCategory as a response.
+ """
+ # Check if the category exists
+ category = get_record_by_id(db, MenuCategory, subcategory_create.category_id)
+
+ if not category:
+ raise HTTPException(status_code=404, detail="Category not found.")
+
+ check_user_permission(db, current_user, category.menu.venue_id)
+
+ # Create a new MenuSubCategory instance from the provided data
+ subcategory_instance = MenuSubCategory.from_create_schema(subcategory_create)
+
+ # Persist the new subcategory in the database
+ created_subcategory = create_record(db, subcategory_instance)
+
+ assert isinstance(
+ created_subcategory, MenuSubCategory
+ ), "The returned object is not of type MenuSubCategory"
+ return created_subcategory.to_read_schema()
+
+
+@router.patch("/subcategory/{subcategory_id}", response_model=MenuSubCategoryRead)
+async def update_menu_subcategory(
+ subcategory_id: uuid.UUID,
+ subcategory_update: MenuSubCategoryUpdate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Update an existing menu subcategory.
+
+ :param subcategory_id: The unique identifier for the subcategory to update.
+ :param subcategory_update: The details to update, provided as a Pydantic model.
+ :param db: Active database session.
+ :return: The updated MenuSubCategory as a response.
+ """
+ # Check if the subcategory exists
+ subcategory = get_record_by_id(db, MenuSubCategory, subcategory_id)
+
+ if not subcategory:
+ raise HTTPException(status_code=404, detail="Subcategory not found.")
+
+ check_user_permission(db, current_user, subcategory.category.menu.venue_id)
+
+ # Update the subcategory with provided data
+ update_data = subcategory_update.dict(
+ exclude_unset=True
+ ) # Exclude unset fields for partial update
+ updated_subcategory = update_record(db, subcategory, update_data)
+
+ assert isinstance(
+ updated_subcategory, MenuSubCategory
+ ), "The returned object is not of type MenuSubCategory"
+ return updated_subcategory.to_read_schema()
+
+
+@router.delete("/subcategory/{subcategory_id}", response_model=dict)
+async def delete_subcategory(
+ subcategory_id: uuid.UUID,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Delete a menu subcategory by its ID.
+
+ :param subcategory_id: The ID of the subcategory to delete.
+ :param db: Active database session.
+ :return: Confirmation message on successful deletion.
+ """
+ subcategory = get_record_by_id(db, MenuSubCategory, subcategory_id)
+
+ if not subcategory:
+ raise HTTPException(status_code=404, detail="Subcategory not found.")
+
+ check_user_permission(db, current_user, subcategory.category.menu.venue_id)
+
+ delete_record(db, subcategory)
+
+ return {"detail": "Subcategory deleted successfully."}
+
+
+##############################################################################################################
+
+
+@router.post("/item/", response_model=MenuItemRead)
+async def create_menu_item(
+ item_create: MenuItemCreate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Create a new menu item associated with a subcategory.
+
+ :param item_create: The details for the new menu item, provided as a Pydantic model.
+ :param db: Active database session.
+ :return: The created MenuItem as a response.
+ """
+ # Check if the subcategory exists
+ subcategory = get_record_by_id(db, MenuSubCategory, item_create.subcategory_id)
+
+ if not subcategory:
+ raise HTTPException(status_code=404, detail="Subcategory not found.")
+
+ check_user_permission(db, current_user, subcategory.category.menu.venue_id)
+
+ # Create a new MenuItem instance from the provided data
+ item_instance = MenuItem.from_create_schema(item_create)
+
+ # Persist the new item in the database
+ created_item = create_record(db, item_instance)
+
+ assert isinstance(
+ created_item, MenuItem
+ ), "The returned object is not of type MenuItem"
+ return created_item.to_read_schema()
+
+
+@router.patch("/item/{item_id}", response_model=MenuItemRead)
+async def update_menu_item(
+ item_id: uuid.UUID,
+ item_update: MenuItemUpdate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Update an existing menu item.
+
+ :param item_id: The unique identifier for the item to update.
+ :param item_update: The details to update, provided as a Pydantic model.
+ :param db: Active database session.
+ :return: The updated MenuItem as a response.
+ """
+ # Check if the item exists
+ item = get_record_by_id(db, MenuItem, item_id)
+
+ if not item:
+ raise HTTPException(status_code=404, detail="Menu item not found.")
+
+ check_user_permission(db, current_user, item.subcategory.category.menu.venue_id)
+
+ # Update the item with provided data
+ updated_item = update_record(db, item, item_update)
+ assert isinstance(
+ updated_item, MenuItem
+ ), "The returned object is not of type MenuItem"
+ return updated_item.to_read_schema()
+
+
+@router.delete("/item/{item_id}", response_model=dict)
+async def delete_menu_item(
+ item_id: uuid.UUID,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Delete a menu item by its ID.
+
+ :param item_id: The ID of the item to delete.
+ :param db: Active database session.
+ :return: Confirmation message on successful deletion.
+ """
+ item = get_record_by_id(db, MenuItem, item_id)
+
+ if not item:
+ raise HTTPException(status_code=404, detail="Menu item not found.")
+
+ check_user_permission(db, current_user, item.subcategory.category.menu.venue_id)
+
+ delete_record(db, item)
+
+ return {"detail": "Menu item deleted successfully."}
+
+
+#########################################################################################################
diff --git a/backend/app/api/routes/qrcode.py b/backend/app/api/routes/qrcode.py
new file mode 100644
index 0000000000..1eb66b76c2
--- /dev/null
+++ b/backend/app/api/routes/qrcode.py
@@ -0,0 +1,179 @@
+import uuid
+from pathlib import Path
+
+from fastapi import APIRouter, Depends, HTTPException
+from fastapi.responses import HTMLResponse
+from jinja2 import Template
+from sqlmodel import Session, select
+
+from app.api.deps import SessionDep, get_current_user, get_db
+from app.models.qrcode import QRCode # Ensure you have this import for your model
+from app.models.user import UserBusiness
+from app.schema.qrcode import (
+ QRCodeCreate,
+ QRCodeRead,
+ QRCodeUpdate,
+)
+
+# Ensure you have these imports for your schemas
+from app.util import (
+ check_user_permission,
+ delete_record,
+ get_record_by_id,
+ update_record,
+)
+
+router = APIRouter()
+
+
+# Return all QR codes for a specific venue
+@router.get("/venue/{venue_id}", response_model=list[QRCodeRead])
+async def read_qrcode_by_venue(
+ venue_id: uuid.UUID,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Retrieve all QR codes associated with a specific venue.
+ """
+ qrcodes = (
+ db.execute(select(QRCode).where(QRCode.venue_id == venue_id)).scalars().all()
+ )
+ # if qrcode is empty, raise an error
+ if not qrcodes:
+ raise HTTPException(status_code=404, detail="No QR codes found for this venue.")
+
+ check_user_permission(db, current_user, venue_id)
+ return [qr_code.to_read_schema() for qr_code in qrcodes]
+
+
+# Get a specific QR code
+@router.get("/{qr_code_id}", response_model=QRCodeRead)
+async def read_qr_code(
+ qr_code_id: uuid.UUID,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Retrieve a specific QR code by ID.
+ """
+ qr_code_instance = get_record_by_id(db, QRCode, qr_code_id)
+ check_user_permission(db, current_user, qr_code_instance.venue_id)
+ assert isinstance(
+ qr_code_instance, QRCode
+ ), "The returned object is not of type QRCode"
+ return qr_code_instance.to_read_schema()
+
+
+# Create a new QR code
+@router.post("/", response_model=QRCodeRead)
+async def create_qr_code(
+ qr_code: QRCodeCreate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Create a new QR code.
+ """
+ check_user_permission(db, current_user, qr_code.venue_id)
+ try:
+ qr_code_instance = QRCode.from_create_schema(qr_code)
+ db.add(qr_code_instance) # Persist the new QR code
+ db.commit() # Commit the session
+ return (
+ qr_code_instance.to_read_schema()
+ ) # Call the instance method to convert to QRCodeRead
+ except Exception as e:
+ db.rollback() # Rollback the session in case of any error
+ raise HTTPException(status_code=500, detail=str(e)) from e
+
+
+# Patch a QR code for partial updates
+@router.patch("/{qr_code_id}", response_model=QRCodeRead)
+async def update_qr_code(
+ qr_code_id: uuid.UUID,
+ updated_qr_code: QRCodeUpdate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ qr_code_instance = get_record_by_id(db, QRCode, qr_code_id)
+
+ if not qr_code_instance:
+ raise HTTPException(status_code=404, detail="QR code not found.")
+
+ # Check user permission before updating the QR code for this venue
+ check_user_permission(db, current_user, qr_code_instance.venue_id)
+
+ updated_qr_code = update_record(db, qr_code_instance, updated_qr_code)
+ assert isinstance(
+ updated_qr_code, QRCode
+ ), "The returned object is not of type QRCode"
+ return updated_qr_code.to_read_schema()
+
+
+# Delete a QR code
+@router.delete("/qrcode/{qr_code_id}", response_model=None)
+async def delete_qr_code(
+ qr_code_id: uuid.UUID,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Delete a QR code by ID.
+ """
+ qr_code_instance = get_record_by_id(db, QRCode, qr_code_id)
+
+ if not qr_code_instance:
+ raise HTTPException(status_code=404, detail="QR code not found.")
+
+ check_user_permission(db, current_user, qr_code_instance.venue_id)
+ return delete_record(db, qr_code_instance)
+
+
+@router.get("/scan/{qr_id}", response_class=HTMLResponse)
+async def scan_qr_code(qr_id: uuid.UUID, session: SessionDep):
+ """
+ Scan a QR code to determine its associated venue and redirect appropriately.
+ """
+ # Retrieve the QR code from the database
+ qr_code_result = session.execute(
+ select(QRCode).where(QRCode.id == qr_id)
+ ).one_or_none()
+
+ if not qr_code_result:
+ raise HTTPException(status_code=404, detail="QR code not found.")
+
+ qr_code = qr_code_result[0]
+ # Determine the venue type and ID from the QR code
+ venue_type, venue_id = None, None
+
+ if qr_code.foodcourt_id:
+ venue_type = "foodcourt"
+ venue_id = qr_code.foodcourt_id
+ elif qr_code.qsr_id:
+ venue_type = "qsr"
+ venue_id = qr_code.qsr_id
+ elif qr_code.nightclub_id:
+ venue_type = "nightclub"
+ venue_id = qr_code.nightclub_id
+ elif qr_code.restaurant_id:
+ venue_type = "restaurant"
+ venue_id = qr_code.restaurant_id
+
+ if not venue_type or not venue_id:
+ raise HTTPException(status_code=400, detail="No associated venue found.")
+
+ # Load the landing page HTML template
+ template_path = Path(__file__).parent.parent.parent / "static" / "landing_page.html"
+ print("template_path:", template_path)
+ try:
+ template_str = template_path.read_text()
+ except FileNotFoundError as exc:
+ raise HTTPException(
+ status_code=500, detail="Landing page template not found."
+ ) from exc
+
+ # Use string.Template to replace placeholders in the HTML
+ template = Template(template_str)
+ html_content = template.render(venueId=venue_id, venueType=venue_type)
+ return HTMLResponse(content=html_content)
diff --git a/backend/app/api/routes/scrapper.py b/backend/app/api/routes/scrapper.py
new file mode 100644
index 0000000000..96c5c62554
--- /dev/null
+++ b/backend/app/api/routes/scrapper.py
@@ -0,0 +1,309 @@
+from fastapi import APIRouter, HTTPException, Depends
+from pydantic import BaseModel, HttpUrl
+import json
+import requests
+from bs4 import BeautifulSoup
+import logging
+from datetime import datetime, time
+import httpx
+from app.api.deps import SessionDep, get_business_user
+from app.models.user import UserBusiness
+from app.schema.venue import RestaurantCreate, VenueCreate
+from app.schema.menu import (
+ MenuCreate,
+ MenuCategoryCreate,
+ MenuSubCategoryCreate,
+ MenuItemCreate
+)
+from app.api.routes.utils import transform_restaurant_data
+
+logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
+logger = logging.getLogger(__name__)
+
+router = APIRouter()
+
+class ZomatoUrl(BaseModel):
+ url: HttpUrl
+
+def fetch_zomato_data(url: str) -> str:
+ headers = {
+ 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
+ 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
+ 'Accept-Language': 'en-US,en;q=0.5',
+ }
+
+ try:
+ logger.info(f"Fetching data from URL: {url}")
+ response = requests.get(url, headers=headers)
+ response.raise_for_status()
+ return response.text
+ except Exception as e:
+ logger.error(f"Error fetching data: {str(e)}")
+ raise
+
+def parse_zomato_page(html_content: str) -> dict:
+ try:
+ soup = BeautifulSoup(html_content, 'html.parser')
+ scripts = soup.find_all('script')
+
+ for script in scripts:
+ if script.string and 'window.__PRELOADED_STATE__' in script.string:
+ json_str = script.string.split('window.__PRELOADED_STATE__ = JSON.parse(')[1]
+ json_str = json_str.split(');')[0].strip()
+ json_str = json_str.strip('"').replace('\\"', '"').replace('\\\\', '\\')
+ return json.loads(json_str)
+
+ raise ValueError("Could not find PRELOADED_STATE in page")
+ except Exception as e:
+ logger.error(f"Error parsing page: {str(e)}")
+ raise
+
+def extract_menu_data(json_data: dict) -> dict:
+ try:
+ with open('data.json', 'w') as f:
+ json.dump(json_data, f, indent=4)
+ restaurant_data = json_data.get('pages', {}).get('current', {})
+ restaurant_details = json_data.get('pages', {}).get('restaurant', {})
+
+ restaurant_id = next(iter(restaurant_details)) if restaurant_details else None
+ if not restaurant_id:
+ raise ValueError("No restaurant ID found")
+
+ res_info = restaurant_details[restaurant_id].get('sections', {})
+ basic_info = res_info.get('SECTION_BASIC_INFO', {})
+ menu_widget = res_info.get('SECTION_MENU_WIDGET', {})
+
+
+ # Validate required name field
+ if not basic_info.get('name'):
+ raise ValueError("Restaurant name is required")
+
+ restaurant_info = {
+ 'cuisine_type': basic_info.get('cuisine_string', ''),
+ 'venue': {
+ 'name': basic_info.get('name', ''),
+ 'address': basic_info.get('address', ''),
+ 'locality': basic_info.get('locality_verbose', ''),
+ 'city': basic_info.get('city', ''),
+ 'latitude': basic_info.get('latitude', '0'),
+ 'longitude': basic_info.get('longitude', '0'),
+ 'zipcode': basic_info.get('zipcode', ''),
+ 'rating': basic_info.get('rating', {}).get('aggregate_rating', '0'),
+ 'timing': basic_info.get('timing', {}).get('timing', ''),
+ 'avg_cost_for_two': basic_info.get('average_cost_for_two', 0)
+ }
+ }
+
+
+ menu_categories = []
+ print("Catorgies", menu_widget.get('menu', {}).get('categories', []))
+ for category in menu_widget.get('menu', {}).get('categories', []):
+ print("category", category)
+ category_data = {
+ 'name': category.get('name', ''),
+ 'description': category.get('description', ''),
+ 'subcategories': []
+ }
+
+ # Group items by subcategory
+ subcategories = {}
+ for item in category.get('items', []):
+ subcategory_name = item.get('category', 'Other')
+
+ if subcategory_name not in subcategories:
+ subcategories[subcategory_name] = {
+ 'name': subcategory_name,
+ 'description': '',
+ 'items': []
+ }
+
+ menu_item = {
+ 'name': item.get('name', ''),
+ 'description': item.get('desc', ''),
+ 'is_veg': item.get('isVeg', True),
+ 'image_url': item.get('itemImage', ''),
+ 'variants': []
+ }
+
+ # Handle variants
+ if item.get('variantsV2'):
+ for variant in item['variantsV2']:
+ menu_item['variants'].append({
+ 'name': variant.get('variantName', ''),
+ 'price': float(variant.get('price', 0)) / 100,
+ 'is_default': variant.get('isDefault', False)
+ })
+ else:
+ menu_item['variants'].append({
+ 'name': 'Regular',
+ 'price': float(item.get('defaultPrice', 0)) / 100,
+ 'is_default': True
+ })
+
+ subcategories[subcategory_name]['items'].append(menu_item)
+
+ # Add non-empty subcategories to category
+ category_data['subcategories'] = [
+ subcat for subcat in subcategories.values()
+ if subcat['items']
+ ]
+
+ if category_data['subcategories']:
+ menu_categories.append(category_data)
+
+ return {
+ 'status': 'success',
+ 'restaurant_info': restaurant_info,
+ 'menu': menu_categories
+ }
+
+ except Exception as e:
+ logger.error(f"Error extracting menu data: {str(e)}")
+ raise HTTPException(
+ status_code=500,
+ detail=f"Failed to extract menu data: {str(e)}"
+ )
+
+
+async def create_restaurant(client: httpx.AsyncClient, restaurant_data: RestaurantCreate):
+ response = await client.post("/venue/restaurants/", json=restaurant_data.dict())
+ response.raise_for_status()
+ return response.json()["id"]
+
+async def create_menu(client: httpx.AsyncClient, menu_data: MenuCreate):
+ response = await client.post("/menu/", json=menu_data.dict())
+ response.raise_for_status()
+ return response.json()["menu_id"]
+
+async def create_category(client: httpx.AsyncClient, category_data: MenuCategoryCreate):
+ response = await client.post("/menu/category/", json=category_data.dict())
+ response.raise_for_status()
+ return response.json()["category_id"]
+
+async def create_subcategory(client: httpx.AsyncClient, subcategory_data: MenuSubCategoryCreate):
+ response = await client.post("/menu/subcategory/", json=subcategory_data.dict())
+ response.raise_for_status()
+ return response.json()["subcategory_id"]
+
+async def create_menu_item(client: httpx.AsyncClient, item_data: MenuItemCreate):
+ response = await client.post("/menu/item/", json=item_data.dict())
+ response.raise_for_status()
+
+@router.post("/menu")
+async def scrape_and_create_menu(
+ request: ZomatoUrl,
+ session: SessionDep,
+ current_user: UserBusiness = Depends(get_business_user)
+):
+ try:
+ # 1. Scrape and log data
+ html_content = fetch_zomato_data(str(request.url))
+ json_data = parse_zomato_page(html_content)
+ scraped_data = extract_menu_data(json_data)
+
+ logger.info("Scraped Restaurant Info:")
+ logger.info(f"Name: {scraped_data['restaurant_info']['name']}")
+ logger.info(f"Cuisines: {scraped_data['restaurant_info']['cuisines']}")
+
+ async with httpx.AsyncClient() as client:
+ # 2. Create Restaurant
+ venue_data = VenueCreate(
+ name=scraped_data['restaurant_info']['name'],
+ description="Restaurant imported from Zomato",
+ avg_expense_for_two=scraped_data['restaurant_info']['avg_cost_for_two'],
+ zomato_link=str(request.url)
+ )
+
+ restaurant_data = RestaurantCreate(
+ venue=venue_data,
+ cuisine_type=scraped_data['restaurant_info']['cuisines']
+ )
+
+ venue_id = await create_restaurant(client, restaurant_data)
+ logger.info(f"Created restaurant with venue_id: {venue_id}")
+
+ # 3. Create Menu
+ menu_data = MenuCreate(
+ name=f"{scraped_data['restaurant_info']['name']} Menu",
+ description="Imported from Zomato",
+ venue_id=venue_id,
+ menu_type="Food"
+ )
+ menu_id = await create_menu(client, menu_data)
+ logger.info(f"Created menu with menu_id: {menu_id}")
+
+ # 4. Create Categories, Subcategories, and Items sequentially
+ for category in scraped_data['menu']:
+ category_data = MenuCategoryCreate(
+ name=category['category'],
+ menu_id=menu_id
+ )
+ category_id = await create_category(client, category_data)
+ logger.info(f"Created category: {category['category']}")
+
+ subcategory_data = MenuSubCategoryCreate(
+ name=f"{category['category']} Items",
+ category_id=category_id,
+ is_alcoholic=False
+ )
+ subcategory_id = await create_subcategory(client, subcategory_data)
+ logger.info(f"Created subcategory for {category['category']}")
+
+ for item in category['items']:
+ item_data = MenuItemCreate(
+ name=item['name'],
+ description=item['description'],
+ price=float(item['price']),
+ subcategory_id=subcategory_id,
+ is_veg=item['is_veg'],
+ image_url=item.get('image_url')
+ )
+ await create_menu_item(client, item_data)
+ logger.info(f"Created item: {item['name']}")
+
+ return {
+ "message": "Menu successfully created",
+ "venue_id": str(venue_id),
+ "menu_id": str(menu_id),
+ "restaurant_name": scraped_data['restaurant_info']['name'],
+ "scraped_data": scraped_data
+ }
+
+ except Exception as e:
+ logger.error(f"Menu creation failed: {str(e)}")
+ raise HTTPException(status_code=500, detail=f"Failed to create menu: {str(e)}")
+
+
+@router.get("/menu/scrape")
+async def get_scraped_menu(url: str):
+ try:
+ # Validate URL
+ zomato_url = ZomatoUrl(url=url)
+
+ # Scrape data using existing functions
+ html_content = fetch_zomato_data(str(zomato_url.url))
+ json_data = parse_zomato_page(html_content)
+ # print(json_data)
+ # scraped_data = extract_menu_data(json_data)
+ print("==== cleaning the data ====")
+ scraped_data = transform_restaurant_data(json_data)
+ print(scraped_data)
+
+ return {
+ "status": "success",
+ "restaurant_info": scraped_data,
+ "menu": scraped_data['menu']
+ }
+
+ except ValueError as ve:
+ logger.error(f"Invalid URL format: {str(ve)}")
+ raise HTTPException(
+ status_code=400,
+ detail=f"Invalid Zomato URL: {str(ve)}"
+ )
+ except Exception as e:
+ logger.error(f"Scraping failed: {str(e)}")
+ raise HTTPException(
+ status_code=500,
+ detail=f"Failed to scrape menu data: {str(e)}"
+ )
diff --git a/backend/app/api/routes/users.py b/backend/app/api/routes/users.py
index c636b094ee..6a757720c0 100644
--- a/backend/app/api/routes/users.py
+++ b/backend/app/api/routes/users.py
@@ -1,228 +1,214 @@
import uuid
-from typing import Any
-from fastapi import APIRouter, Depends, HTTPException
-from sqlmodel import col, delete, func, select
+from fastapi import APIRouter, Depends, HTTPException, Query
+from sqlmodel import Session
-from app import crud
from app.api.deps import (
- CurrentUser,
SessionDep,
- get_current_active_superuser,
+ get_business_user,
+ get_current_user,
+ get_db,
+ get_public_user,
+ get_super_user,
)
-from app.core.config import settings
-from app.core.security import get_password_hash, verify_password
-from app.models import (
- Item,
- Message,
- UpdatePassword,
- User,
- UserCreate,
- UserPublic,
- UserRegister,
- UsersPublic,
- UserUpdate,
- UserUpdateMe,
+from app.models import UserBusiness, UserPublic
+from app.schema.user import (
+ UserBusinessCreate,
+ UserBusinessRead,
+ UserBusinessUpdate,
+ UserPublicRead,
+ UserPublicUpdate,
+)
+from app.util import (
+ create_record,
+ delete_record,
+ get_all_records,
+ get_record_by_id,
+ update_record,
)
-from app.utils import generate_new_account_email, send_email
router = APIRouter()
-@router.get(
- "/",
- dependencies=[Depends(get_current_active_superuser)],
- response_model=UsersPublic,
-)
-def read_users(session: SessionDep, skip: int = 0, limit: int = 100) -> Any:
+@router.get("/me", response_model=UserPublicRead | UserBusinessRead)
+async def read_user_me(
+ current_user: UserPublic | UserBusiness = Depends(get_current_user),
+):
+ print("current_user", current_user)
"""
- Retrieve users.
+ Retrieve profile information of the currently authenticated user.
"""
+ x = current_user.to_read_schema()
+ print("hui", x)
+ return x
- count_statement = select(func.count()).select_from(User)
- count = session.exec(count_statement).one()
- statement = select(User).offset(skip).limit(limit)
- users = session.exec(statement).all()
+@router.get("/all-user-business/", response_model=list[UserBusinessRead])
+async def all_read_user_business(
+ db: Session = Depends(get_db),
+ skip: int = Query(0, alias="page", ge=0),
+ limit: int = Query(10, le=100),
+ current_user: UserBusiness = Depends(get_super_user), # noqa: ARG001
+):
+ """
+ Retrieve a paginated list of user businesses.
+ - **skip**: The page number (starting from 0)
+ - **limit**: The number of items per page
+ """
+ all_users = get_all_records(db, UserBusiness, skip=skip, limit=limit)
- return UsersPublic(data=users, count=count)
+ if all_users is None:
+ raise HTTPException(status_code=404, detail="No user businesses found.")
+ # Convert each record to its read schema
+ assert all(
+ hasattr(user, "to_read_schema") for user in all_users
+ ), "Each user must implement 'to_read_schema'"
-@router.post(
- "/", dependencies=[Depends(get_current_active_superuser)], response_model=UserPublic
-)
-def create_user(*, session: SessionDep, user_in: UserCreate) -> Any:
- """
- Create new user.
- """
- user = crud.get_user_by_email(session=session, email=user_in.email)
- if user:
- raise HTTPException(
- status_code=400,
- detail="The user with this email already exists in the system.",
- )
+ return [user.to_read_schema() for user in all_users]
- user = crud.create_user(session=session, user_create=user_in)
- if settings.emails_enabled and user_in.email:
- email_data = generate_new_account_email(
- email_to=user_in.email, username=user_in.email, password=user_in.password
- )
- send_email(
- email_to=user_in.email,
- subject=email_data.subject,
- html_content=email_data.html_content,
- )
- return user
-
-
-@router.patch("/me", response_model=UserPublic)
-def update_user_me(
- *, session: SessionDep, user_in: UserUpdateMe, current_user: CurrentUser
-) -> Any:
- """
- Update own user.
- """
-
- if user_in.email:
- existing_user = crud.get_user_by_email(session=session, email=user_in.email)
- if existing_user and existing_user.id != current_user.id:
- raise HTTPException(
- status_code=409, detail="User with this email already exists"
- )
- user_data = user_in.model_dump(exclude_unset=True)
- current_user.sqlmodel_update(user_data)
- session.add(current_user)
- session.commit()
- session.refresh(current_user)
- return current_user
-
-
-@router.patch("/me/password", response_model=Message)
-def update_password_me(
- *, session: SessionDep, body: UpdatePassword, current_user: CurrentUser
-) -> Any:
- """
- Update own password.
- """
- if not verify_password(body.current_password, current_user.hashed_password):
- raise HTTPException(status_code=400, detail="Incorrect password")
- if body.current_password == body.new_password:
- raise HTTPException(
- status_code=400, detail="New password cannot be the same as the current one"
- )
- hashed_password = get_password_hash(body.new_password)
- current_user.hashed_password = hashed_password
- session.add(current_user)
- session.commit()
- return Message(message="Password updated successfully")
-
-
-@router.get("/me", response_model=UserPublic)
-def read_user_me(current_user: CurrentUser) -> Any:
- """
- Get current user.
- """
- return current_user
-
-
-@router.delete("/me", response_model=Message)
-def delete_user_me(session: SessionDep, current_user: CurrentUser) -> Any:
- """
- Delete own user.
- """
- if current_user.is_superuser:
- raise HTTPException(
- status_code=403, detail="Super users are not allowed to delete themselves"
- )
- statement = delete(Item).where(col(Item.owner_id) == current_user.id)
- session.exec(statement) # type: ignore
- session.delete(current_user)
- session.commit()
- return Message(message="User deleted successfully")
-
-
-@router.post("/signup", response_model=UserPublic)
-def register_user(session: SessionDep, user_in: UserRegister) -> Any:
- """
- Create new user without the need to be logged in.
- """
- user = crud.get_user_by_email(session=session, email=user_in.email)
- if user:
- raise HTTPException(
- status_code=400,
- detail="The user with this email already exists in the system",
- )
- user_create = UserCreate.model_validate(user_in)
- user = crud.create_user(session=session, user_create=user_create)
- return user
-
-
-@router.get("/{user_id}", response_model=UserPublic)
-def read_user_by_id(
- user_id: uuid.UUID, session: SessionDep, current_user: CurrentUser
-) -> Any:
- """
- Get a specific user by id.
- """
- user = session.get(User, user_id)
- if user == current_user:
- return user
- if not current_user.is_superuser:
- raise HTTPException(
- status_code=403,
- detail="The user doesn't have enough privileges",
- )
- return user
+@router.get("/user-businesses/{user_business_id}", response_model=UserBusinessRead)
+async def read_user_business(
+ user_business_id: uuid.UUID,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_super_user), # noqa: ARG001
+):
+ """
+ Retrieve a single user business by ID.
+ - **user_business_id**: The ID of the user business to retrieve
+ """
+ user_instance = get_record_by_id(db, UserBusiness, user_business_id)
-@router.patch(
- "/{user_id}",
- dependencies=[Depends(get_current_active_superuser)],
- response_model=UserPublic,
-)
-def update_user(
- *,
+ return user_instance.to_read_schema()
+
+
+@router.post("/user-businesses/", response_model=UserBusinessRead)
+async def create_user_business(
+ user_business: UserBusinessCreate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_super_user),
+):
+ """
+ Create a new user business.
+ - **user_business**: The user business data to create
+ """
+
+ try:
+ user_instance = UserBusiness.from_create_schema(user_business)
+ user_instance.id = current_user.id
+ return create_record(db, user_instance)
+ except Exception as e:
+ db.rollback()
+ raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.patch("/user-businesses/{user_business_id}", response_model=UserBusinessRead)
+async def update_user_business(
+ user_business: UserBusinessUpdate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_current_user),
+):
+ """
+ Update an existing user business.
+ - **user_business_id**: The ID of the user business to update
+ - **user_business**: The updated user business data
+ """
+ try:
+ user_instance = UserBusiness.from_create_schema(user_business)
+ return update_record(db, current_user, user_instance)
+ except Exception as e:
+ db.rollback()
+ raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.delete("/user-businesses/{user_business_id}", response_model=dict)
+async def delete_user_business(
+ user_business_id: uuid.UUID,
+ session: SessionDep,
+ current_user: UserBusiness = Depends(get_super_user), # noqa: ARG001
+):
+ """
+ Delete a user business by ID.
+ - **user_business_id**: The ID of the user business to delete
+ """
+ user_instance = get_record_by_id(session, UserBusiness, user_business_id)
+
+ delete_record(session, user_instance)
+ return {"message": f"UserBusiness with ID {user_business_id} has been deleted."}
+
+
+@router.get("/all-user-public/", response_model=list[UserPublicRead])
+async def all_read_user_public(
+ db: Session = Depends(get_db),
+ skip: int = Query(0, alias="page", ge=0),
+ limit: int = Query(10, le=100),
+ current_user: UserBusiness = Depends(get_business_user), # noqa: ARG001
+):
+ """
+ Retrieve a paginated list of user public.
+ - **skip**: The page number (starting from 0)
+ - **limit**: The number of items per page
+ """
+ all_users = get_all_records(db, UserPublic, skip=skip, limit=limit)
+
+ if all_users is None:
+ raise HTTPException(status_code=404, detail="No user found.")
+
+ assert all(
+ hasattr(user, "to_read_schema") for user in all_users
+ ), "Each user must implement 'to_read_schema'"
+
+ # Convert each record to its read schema
+ return [user.to_read_schema() for user in all_users]
+
+
+@router.get("/user-public/{user_public_id}", response_model=UserPublicRead)
+async def read_user_public(
+ user_public_id: uuid.UUID,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_business_user), # noqa: ARG001
+):
+ """
+ Retrieve a single user public by ID.
+ - **user_public_id**: The ID of the user public to retrieve
+ """
+ user_instance = get_record_by_id(db, UserBusiness, user_public_id)
+
+ return user_instance.to_read_schema()
+
+
+@router.patch("/user-public/", response_model=UserPublicRead)
+async def update_user_public_me(
+ user_public: UserPublicUpdate,
+ db: Session = Depends(get_db),
+ current_user: UserPublic = Depends(get_public_user),
+):
+ """
+ Update an existing user public.
+ - **user_public_id**: The ID of the user public to update
+ - **user_public**: The updated user public data
+ """
+ print("user_public", user_public)
+ try:
+ user_instance = UserPublic.from_create_schema(user_public)
+ return update_record(db, current_user, user_instance)
+ except Exception as e:
+ db.rollback()
+ raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.delete("/user-public/{user_public_id}", response_model=dict)
+async def delete_user_public(
+ user_public_id: uuid.UUID,
session: SessionDep,
- user_id: uuid.UUID,
- user_in: UserUpdate,
-) -> Any:
- """
- Update a user.
- """
-
- db_user = session.get(User, user_id)
- if not db_user:
- raise HTTPException(
- status_code=404,
- detail="The user with this id does not exist in the system",
- )
- if user_in.email:
- existing_user = crud.get_user_by_email(session=session, email=user_in.email)
- if existing_user and existing_user.id != user_id:
- raise HTTPException(
- status_code=409, detail="User with this email already exists"
- )
-
- db_user = crud.update_user(session=session, db_user=db_user, user_in=user_in)
- return db_user
-
-
-@router.delete("/{user_id}", dependencies=[Depends(get_current_active_superuser)])
-def delete_user(
- session: SessionDep, current_user: CurrentUser, user_id: uuid.UUID
-) -> Message:
- """
- Delete a user.
- """
- user = session.get(User, user_id)
- if not user:
- raise HTTPException(status_code=404, detail="User not found")
- if user == current_user:
- raise HTTPException(
- status_code=403, detail="Super users are not allowed to delete themselves"
- )
- statement = delete(Item).where(col(Item.owner_id) == user_id)
- session.exec(statement) # type: ignore
- session.delete(user)
- session.commit()
- return Message(message="User deleted successfully")
+ current_user: UserBusiness = Depends(get_super_user), # noqa: ARG001
+):
+ """
+ Delete a user public by ID.
+ - **user_public_id**: The ID of the user public to delete
+ """
+ user_instance = get_record_by_id(session, UserBusiness, user_public_id)
+
+ delete_record(session, user_instance)
+ return {"message": f"UserPublic with ID {user_public_id} has been deleted."}
diff --git a/backend/app/api/routes/utils.py b/backend/app/api/routes/utils.py
index 82f6d2b821..6b169536db 100644
--- a/backend/app/api/routes/utils.py
+++ b/backend/app/api/routes/utils.py
@@ -1,26 +1,184 @@
-from fastapi import APIRouter, Depends
-from pydantic.networks import EmailStr
+def transform_restaurant_data(zomato_data):
+ """
+ Transform Zomato restaurant data into the specified MenuData format.
+
+ Args:
+ zomato_data (dict): The Zomato restaurant data in its original format
+
+ Returns:
+ dict: The transformed data in MenuData format
+ """
+ try:
+ # Extract the menu data from the Zomato data structure
+ restaurant = zomato_data.get('pages', {}).get('restaurant', {})
+
+ resId = list(restaurant)[0]
+
+ menu_list = zomato_data.get('pages', {}).get('restaurant', {}).get(resId, {}).get('order', {}).get('menuList', {})
+
+ if not menu_list:
+ menu_list = zomato_data.get('order', {}).get('menuList', {})
+
+ menus = menu_list.get('menus', [])
+
+ # Initialize the result structure
+ result = {
+ "menu": []
+ }
+
+ # Process each menu category
+
+ categories = []
+ for menu_entry in menus:
+
-from app.api.deps import get_current_active_superuser
-from app.models import Message
-from app.utils import generate_test_email, send_email
-router = APIRouter()
+ menu = menu_entry.get('menu', {})
+ subcategories = menu.get('categories', [])
+
+ for sub_cat_entry in subcategories:
+ subcategory = sub_cat_entry.get('category', {})
+ subcategory_name = subcategory.get('name', '')
+ items = subcategory.get('items', [])
+
+ # Check if we need to create a subcategory
+ has_subcategories = False
+ subcategories_map = {}
+
+ # First, scan items to see if they have any group information that could be used as subcategories
+ for item_entry in items:
+ item = item_entry.get('item', {})
+ # Look for potential subcategory indicators in the item data
+ # This could be customized based on the actual data structure
+ groups = item.get('groups', [])
+ if groups:
+ has_subcategories = True
+ for group_entry in groups:
+ group = group_entry.get('group', {})
+ subcategory_name = group.get('name', 'Other')
+ if subcategory_name not in subcategories_map:
+ subcategories_map[subcategory_name] = []
+
+ # If no subcategories found, create a default one
+ if not has_subcategories:
+ subcategories_map['General'] = []
+
+ # Process each menu item and assign to appropriate subcategory
+ for item_entry in items:
+ item = item_entry.get('item', {})
+
+ # Transform the item to match the MenuItem interface
+ transformed_item = {
+ "id": item.get('id', ''),
+ "name": item.get('name', ''),
+ "description": item.get('desc', ''),
+ "price": item.get('price', 0),
+ "is_veg": any(tag == "pure_veg" for tag in item.get('tag_slugs', [])),
+ "spice_level": determine_spice_level(item),
+ "image_url": extract_image_url(item)
+ }
+
+ # Determine which subcategory this item belongs to
+ assigned = False
+ groups = item.get('groups', [])
+ if groups:
+ for group_entry in groups:
+ group = group_entry.get('group', {})
+ subcategory_name = group.get('name', 'Other')
+ if subcategory_name in subcategories_map:
+ subcategories_map[subcategory_name].append(transformed_item)
+ assigned = True
+ break
+
+ # If no subcategory was assigned, put in the first available subcategory
+ if not assigned:
+ default_subcategory = next(iter(subcategories_map.keys()))
+ subcategories_map[default_subcategory].append(transformed_item)
+
+ # Create the category entry with its subcategories
+ category_entry = {
+ "category": menu.get('name', ''),
+ "subcategories": [
+ {
+ "subcategory": subcategory_name,
+ "items": items_list
+ }
+ for subcategory_name, items_list in subcategories_map.items()
+ ]
+ }
+
+ result["menu"].append(category_entry)
+
+ return result
+
+ except Exception as e:
+ print(f"Error transforming data: {e}")
+ # Return a minimal valid structure in case of error
+ return {"menu": []}
-@router.post(
- "/test-email/",
- dependencies=[Depends(get_current_active_superuser)],
- status_code=201,
-)
-def test_email(email_to: EmailStr) -> Message:
+def determine_spice_level(item):
"""
- Test emails.
+ Determine the spice level of an item based on available tags or description.
+
+ Args:
+ item (dict): The menu item data
+
+ Returns:
+ str: One of 'None', 'Mild', 'Medium', 'Spicy', or 'Hot'
"""
- email_data = generate_test_email(email_to=email_to)
- send_email(
- email_to=email_to,
- subject=email_data.subject,
- html_content=email_data.html_content,
- )
- return Message(message="Test email sent")
+ # Check tags for spice indicators
+ tags = item.get('tag_slugs', [])
+ desc = item.get('desc', '').lower()
+
+ # This is a simple heuristic and could be enhanced based on actual data patterns
+ if any(spicy_tag in tags for spicy_tag in ['extra_spicy', 'very_hot']):
+ return 'Hot'
+ elif any(spicy_tag in tags for spicy_tag in ['spicy', 'hot']):
+ return 'Spicy'
+ elif any(medium_tag in tags for medium_tag in ['medium_spicy', 'medium_hot']):
+ return 'Medium'
+ elif any(mild_tag in tags for mild_tag in ['mild_spicy', 'slightly_spicy']):
+ return 'Mild'
+
+ # Check description for spice indicators
+ if any(hot_term in desc for hot_term in ['very spicy', 'extra hot', 'extremely spicy']):
+ return 'Hot'
+ elif any(spicy_term in desc for spicy_term in ['spicy', 'hot']):
+ return 'Spicy'
+ elif any(medium_term in desc for medium_term in ['medium spicy', 'moderately spiced']):
+ return 'Medium'
+ elif any(mild_term in desc for mild_term in ['mild spice', 'slightly spicy']):
+ return 'Mild'
+
+ # Default value
+ return 'None'
+
+def extract_image_url(item):
+ """
+ Extract the image URL from an item.
+
+ Args:
+ item (dict): The menu item data
+
+ Returns:
+ str: The image URL, or None if not available
+ """
+ # First try to get the specific item image URL
+ image_url = item.get('item_image_url')
+ if image_url:
+ return image_url
+
+ # Then check the media array for images
+ media = item.get('media', [])
+ for media_item in media:
+ if media_item.get('mediaType') == 'image':
+ image_data = media_item.get('image', {})
+ if image_data and image_data.get('url'):
+ return image_data.get('url')
+
+ # If no image found, return None
+ return None
+
+# Example usage:
+# transformed_data = transform_restaurant_data(zomato_data)
diff --git a/backend/app/api/routes/venues.py b/backend/app/api/routes/venues.py
new file mode 100644
index 0000000000..ea2601a5bf
--- /dev/null
+++ b/backend/app/api/routes/venues.py
@@ -0,0 +1,218 @@
+from fastapi import APIRouter, Depends, FastAPI, HTTPException
+from sqlmodel import Session
+
+from app.api.deps import (
+ get_business_user,
+ get_db,
+)
+from app.models.user import UserBusiness, UserVenueAssociation
+from app.models.venue import QSR, Foodcourt, Nightclub, Restaurant, Venue
+from app.schema.venue import (
+ FoodcourtCreate,
+ FoodcourtRead,
+ NightclubCreate,
+ NightclubRead,
+ QSRCreate,
+ QSRRead,
+ RestaurantCreate,
+ RestaurantRead,
+ VenueListResponse,
+)
+
+# Assuming you have a dependency to get the database session
+from app.util import (
+ create_record,
+ get_all_records,
+)
+
+app = FastAPI()
+router = APIRouter()
+
+
+# POST endpoint for Foodcourt
+@router.post("/foodcourts/", response_model=FoodcourtRead)
+def create_foodcourt(
+ foodcourt: FoodcourtCreate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_business_user),
+):
+ try:
+ # Check if the venue exists
+ venue_instance = Venue.from_create_schema(foodcourt.venue)
+ create_record(db, venue_instance) # Persist the new venue
+ # Use the newly created venue instance
+ foodcourt_instance = Foodcourt.from_create_schema(venue_instance.id, foodcourt)
+ # Create the new Foodcourt record in the database
+ create_record(db, foodcourt_instance)
+ association = UserVenueAssociation(
+ user_id=current_user.id, venue_id=venue_instance.id
+ )
+ create_record(db, association)
+
+ return foodcourt_instance.to_read_schema()
+
+ except Exception as e:
+ # Rollback the session in case of any error
+ db.rollback()
+ raise HTTPException(status_code=500, detail=str(e)) # Respond with a 500 error
+
+
+# GET endpoint for Foodcourt
+@router.get("/foodcourts/", response_model=list[FoodcourtRead])
+def read_foodcourts(skip: int = 0, limit: int = 10, db: Session = Depends(get_db)):
+ return get_all_records(db, Foodcourt, skip=skip, limit=limit)
+
+
+# POST endpoint for QSR
+@router.post("/qsrs/", response_model=QSRRead)
+def create_qsr(
+ qsr: QSRCreate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_business_user),
+):
+ try:
+ # Check if the venue exists
+ venue_instance = Venue.from_create_schema(qsr.venue)
+ create_record(db, venue_instance) # Persist the new venue
+ # Use the newly created venue instance
+ qsr_instance = QSR.from_create_schema(venue_instance.id, qsr)
+ # Create the new Foodcourt record in the database
+ create_record(db, qsr_instance)
+ association = UserVenueAssociation(
+ user_id=current_user.id, venue_id=venue_instance.id
+ )
+ create_record(db, association)
+ return qsr_instance.to_read_schema()
+
+ except Exception as e:
+ # Rollback the session in case of any error
+ db.rollback()
+ raise HTTPException(status_code=500, detail=str(e)) # Respond with a 500 error
+
+
+# GET endpoint for QSR
+@router.get("/qsrs/", response_model=list[QSRRead])
+def read_qsrs(skip: int = 0, limit: int = 10, db: Session = Depends(get_db)):
+ return get_all_records(db, QSR, skip=skip, limit=limit)
+
+
+# POST endpoint for Restaurant
+@router.post("/restaurants/", response_model=RestaurantRead)
+def create_restaurant(
+ restaurant: RestaurantCreate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_business_user),
+):
+ try:
+ # Check if the venue exists
+ venue_instance = Venue.from_create_schema(restaurant.venue)
+ create_record(db, venue_instance) # Persist the new venue
+ # Use the newly created venue instance
+ restaurant_instance = Restaurant.from_create_schema(
+ venue_instance.id, restaurant
+ )
+ # Create the new Foodcourt record in the database
+ create_record(db, restaurant_instance)
+ association = UserVenueAssociation(
+ user_id=current_user.id, venue_id=venue_instance.id
+ )
+ create_record(db, association)
+ return restaurant_instance.to_read_schema()
+
+ except Exception as e:
+ # Rollback the session in case of any error
+ db.rollback()
+ raise HTTPException(status_code=500, detail=str(e)) # Respond with a 500 error
+
+
+# GET endpoint for Restaurant
+@router.get("/restaurants/", response_model=list[RestaurantRead])
+def read_restaurants(skip: int = 0, limit: int = 10, db: Session = Depends(get_db)):
+ return get_all_records(db, Restaurant, skip=skip, limit=limit)
+
+
+# POST endpoint for Nightclub
+@router.post("/nightclubs/", response_model=NightclubRead)
+def create_nightclub(
+ nightclub: NightclubCreate,
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_business_user),
+):
+ try:
+ # Check if the venue exists
+ venue_instance = Venue.from_create_schema(nightclub.venue)
+ create_record(db, venue_instance) # Persist the new venue
+ # Use the newly created venue instance
+ nightclub_instance = Nightclub.from_create_schema(venue_instance.id, nightclub)
+ # Create the new Foodcourt record in the database
+ create_record(db, nightclub_instance)
+ association = UserVenueAssociation(
+ user_id=current_user.id, venue_id=venue_instance.id
+ )
+ create_record(db, association)
+ return nightclub_instance.to_read_schema()
+
+ except Exception as e:
+ # Rollback the session in case of any error
+ db.rollback()
+ raise HTTPException(status_code=500, detail=str(e)) # Respond with a 500 error
+
+
+# GET endpoint for Nightclub
+@router.get("/nightclubs/", response_model=list[NightclubRead])
+def read_nightclubs(skip: int = 0, limit: int = 10, db: Session = Depends(get_db)):
+ return get_all_records(db, Nightclub, skip=skip, limit=limit)
+
+
+@router.get("/my-venues/", response_model=VenueListResponse)
+async def get_my_venues(
+ db: Session = Depends(get_db),
+ current_user: UserBusiness = Depends(get_business_user),
+):
+ """
+ Retrieve the venues managed by the current user, organized by venue type.
+
+ This method leverages SQLAlchemy's efficient querying capabilities to minimize database load
+ while ensuring data integrity through the association table, UserVenueAssociation.
+ """
+
+ # Fetch all venues managed by the current user
+ managed_venues = (
+ db.query(Venue)
+ .join(UserVenueAssociation)
+ .filter(UserVenueAssociation.user_id == current_user.id)
+ .all()
+ )
+
+ # Create a set for fast membership testing
+ managed_venue_ids = {venue.id for venue in managed_venues}
+
+ # Initialize lists for categorized venues
+ nightclubs, qsrs, foodcourts, restaurants = [], [], [], []
+
+ # Efficiently query and convert Nightclubs
+ for nightclub in (
+ db.query(Nightclub).filter(Nightclub.venue_id.in_(managed_venue_ids)).all()
+ ):
+ nightclubs.append(nightclub.to_read_schema())
+
+ # Efficiently query and convert QSRs
+ for qsr in db.query(QSR).filter(QSR.venue_id.in_(managed_venue_ids)).all():
+ qsrs.append(qsr.to_read_schema())
+
+ # Efficiently query and convert Foodcourts
+ for foodcourt in (
+ db.query(Foodcourt).filter(Foodcourt.venue_id.in_(managed_venue_ids)).all()
+ ):
+ foodcourts.append(foodcourt.to_read_schema())
+
+ # Efficiently query and convert Restaurants
+ for restaurant in (
+ db.query(Restaurant).filter(Restaurant.venue_id.in_(managed_venue_ids)).all()
+ ):
+ restaurants.append(restaurant.to_read_schema())
+
+ # Construct and return the response
+ return VenueListResponse(
+ nightclubs=nightclubs, qsrs=qsrs, foodcourts=foodcourts, restaurants=restaurants
+ )
diff --git a/backend/app/backend_pre_start.py b/backend/app/backend_pre_start.py
index c2f8e29ae1..9b9a3c3b81 100644
--- a/backend/app/backend_pre_start.py
+++ b/backend/app/backend_pre_start.py
@@ -28,7 +28,6 @@ def init(db_engine: Engine) -> None:
logger.error(e)
raise e
-
def main() -> None:
logger.info("Initializing service")
init(engine)
diff --git a/backend/app/constants.py b/backend/app/constants.py
new file mode 100644
index 0000000000..5ce00e9968
--- /dev/null
+++ b/backend/app/constants.py
@@ -0,0 +1,8 @@
+# constants.py
+from enum import Enum
+
+
+class Gender(Enum):
+ MALE = "male"
+ FEMALE = "female"
+ OTHERS = ("others",)
diff --git a/backend/app/core/config.py b/backend/app/core/config.py
index 1e3a440c1c..c5392033df 100644
--- a/backend/app/core/config.py
+++ b/backend/app/core/config.py
@@ -1,16 +1,14 @@
import secrets
import warnings
-from typing import Annotated, Any, Literal
+from typing import Annotated, Any, ClassVar, Literal
from pydantic import (
AnyUrl,
BeforeValidator,
HttpUrl,
- PostgresDsn,
computed_field,
model_validator,
)
-from pydantic_core import MultiHostUrl
from pydantic_settings import BaseSettings, SettingsConfigDict
from typing_extensions import Self
@@ -30,10 +28,15 @@ class Settings(BaseSettings):
API_V1_STR: str = "/api/v1"
SECRET_KEY: str = secrets.token_urlsafe(32)
# 60 minutes * 24 hours * 8 days = 8 days
- ACCESS_TOKEN_EXPIRE_MINUTES: int = 60 * 24 * 8
+ ACCESS_TOKEN_EXPIRE_MINUTES: int = 60
DOMAIN: str = "localhost"
ENVIRONMENT: Literal["local", "staging", "production"] = "local"
+ # Add CLIENT_ID and CLIENT_SECRET
+ CLIENT_ID: str
+ CLIENT_SECRET: str
+ REFRESH_TOKEN_EXPIRE_DAYS: ClassVar[int] = 365 # Use ClassVar if it's a constant
+ ALGORITHM: str = "HS256"
@computed_field # type: ignore[prop-decorator]
@property
def server_host(self) -> str:
@@ -56,15 +59,8 @@ def server_host(self) -> str:
@computed_field # type: ignore[prop-decorator]
@property
- def SQLALCHEMY_DATABASE_URI(self) -> PostgresDsn:
- return MultiHostUrl.build(
- scheme="postgresql+psycopg",
- username=self.POSTGRES_USER,
- password=self.POSTGRES_PASSWORD,
- host=self.POSTGRES_SERVER,
- port=self.POSTGRES_PORT,
- path=self.POSTGRES_DB,
- )
+ def SQLALCHEMY_DATABASE_URI(self) -> str:
+ return f"postgresql://{self.POSTGRES_USER}:{self.POSTGRES_PASSWORD}@{self.POSTGRES_SERVER}:{self.POSTGRES_PORT}/{self.POSTGRES_DB}"
SMTP_TLS: bool = True
SMTP_SSL: bool = False
@@ -113,8 +109,10 @@ def _enforce_non_default_secrets(self) -> Self:
self._check_default_secret(
"FIRST_SUPERUSER_PASSWORD", self.FIRST_SUPERUSER_PASSWORD
)
+ print(f"FIRST_SUPERUSER_PASSWORD: {self.FIRST_SUPERUSER_PASSWORD}")
return self
-
-settings = Settings() # type: ignore
+print("About to initialize Settings...")
+settings = Settings()
+print("Settings initialized.")
diff --git a/backend/app/core/db.py b/backend/app/core/db.py
index d260a856d2..6b8554581e 100644
--- a/backend/app/core/db.py
+++ b/backend/app/core/db.py
@@ -1,34 +1,49 @@
-from sqlmodel import Session, create_engine, select
+from sqlmodel import Session, create_engine
-from app import crud
from app.core.config import settings
-from app.models import User, UserCreate
+print("SQLALCHEMY_DATABASE_URI : ", str(settings.SQLALCHEMY_DATABASE_URI))
engine = create_engine(str(settings.SQLALCHEMY_DATABASE_URI))
-
-
-# make sure all SQLModel models are imported (app.models) before initializing DB
-# otherwise, SQLModel might fail to initialize relationships properly
-# for more details: https://github.com/fastapi/full-stack-fastapi-template/issues/28
-
-
-def init_db(session: Session) -> None:
- # Tables should be created with Alembic migrations
- # But if you don't want to use migrations, create
- # the tables un-commenting the next lines
- # from sqlmodel import SQLModel
-
- # from app.core.engine import engine
- # This works because the models are already imported and registered from app.models
- # SQLModel.metadata.create_all(engine)
-
- user = session.exec(
- select(User).where(User.email == settings.FIRST_SUPERUSER)
- ).first()
- if not user:
- user_in = UserCreate(
- email=settings.FIRST_SUPERUSER,
- password=settings.FIRST_SUPERUSER_PASSWORD,
- is_superuser=True,
- )
- user = crud.create_user(session=session, user_create=user_in)
+print("engine created : ")
+
+connection = engine.connect()
+print("Connection successful!")
+connection.close()
+
+def init_db() -> None:
+ """
+ Initialize the database with the necessary default data.
+ Assumes that database schema is up-to-date due to Alembic migrations.
+ """
+ # Example: Create the superuser if it does not exist
+ with Session(engine) as session:
+ print("here")
+ # Check for existing superuser
+ # superuser = session.exec(
+ # select(UserBusiness).where(UserBusiness.email == settings.FIRST_SUPERUSER)
+ # ).first()
+ # print("heree")
+
+ # if not superuser:
+ # print("here1")
+ # user_in = UserBusiness(
+ # email=settings.FIRST_SUPERUSER,
+ # phone_number=None,
+ # is_active=True,
+ # is_superuser=True,
+ # full_name="Superuser",
+ # registration_date=datetime.utcnow()
+ # )
+ # print("here2")
+ # # Create superuser in the database
+ # session.add(user_in)
+ # print("here3")
+ # session.commit()
+ # print("here4")
+ # session.refresh(user_in)
+
+ # Other initial setup tasks can go here
+ # Example: Create default Nightclub, Foodcourt, etc.
+ # ...
+
+ print("Database initialization complete.")
diff --git a/backend/app/core/security.py b/backend/app/core/security.py
index 7aff7cfb32..cdae82e4cd 100644
--- a/backend/app/core/security.py
+++ b/backend/app/core/security.py
@@ -1,27 +1,68 @@
+import uuid # For generating unique token ID
from datetime import datetime, timedelta, timezone
-from typing import Any
import jwt
-from passlib.context import CryptContext
+from fastapi import HTTPException, status
from app.core.config import settings
+from app.models.auth import AccessToken, RefreshToken, TokenModel
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
+ALGORITHM = "HS256"
+def get_jwt_payload(token: str) -> TokenModel:
+ try:
+ # Decode the token using the secret key and algorithm
+ payload = jwt.decode(token, settings.SECRET_KEY, algorithms=[settings.ALGORITHM])
+ print('payload ', payload)
+ # Create and return a TokenModel instance with the decoded payload
+ return TokenModel(sub=payload.get("sub"), exp=payload.get("exp"))
-ALGORITHM = "HS256"
+ except jwt.ExpiredSignatureError:
+ # Handle expired token
+ raise HTTPException(
+ status_code=status.HTTP_401_UNAUTHORIZED,
+ detail="Token has expired"
+ )
+ except jwt.InvalidTokenError:
+ raise HTTPException(
+ status_code=status.HTTP_401_UNAUTHORIZED,
+ detail="Invalid token"
+ )
+ except Exception as e:
+ raise HTTPException(
+ status_code=status.HTTP_400_BAD_REQUEST,
+ detail=f"Token validation failed: {str(e)}"
+ )
+def create_access_token(subject: str, expires_delta: timedelta | None = None) -> AccessToken:
+ if expires_delta:
+ expire = datetime.now(timezone.utc) + expires_delta
+ else:
+ expire = datetime.now(timezone.utc) + timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
-def create_access_token(subject: str | Any, expires_delta: timedelta) -> str:
- expire = datetime.now(timezone.utc) + expires_delta
- to_encode = {"exp": expire, "sub": str(subject)}
+ jti = str(uuid.uuid4())
+ to_encode = {"exp": expire, "sub": str(subject), "jti": jti}
encoded_jwt = jwt.encode(to_encode, settings.SECRET_KEY, algorithm=ALGORITHM)
- return encoded_jwt
+ # Create an instance of AccessToken with the encoded JWT and expiration time
+ access_token = AccessToken(
+ token=encoded_jwt,
+ expires_at=expire,
+ token_type="Bearer"
+ )
-def verify_password(plain_password: str, hashed_password: str) -> bool:
- return pwd_context.verify(plain_password, hashed_password)
+ return access_token
+
+def create_refresh_token(subject: str) -> RefreshToken:
+ expire = datetime.now(timezone.utc) + timedelta(days=settings.REFRESH_TOKEN_EXPIRE_DAYS)
+ jti = str(uuid.uuid4())
+ to_encode = {"sub": str(subject), "exp": expire, "jti": jti}
+ encoded_jwt = jwt.encode(to_encode, settings.SECRET_KEY, algorithm=ALGORITHM)
+ # Create an instance of RefreshToken with the encoded JWT and expiration time
+ refresh_token = RefreshToken(
+ token=encoded_jwt,
+ expires_at=expire
+ )
-def get_password_hash(password: str) -> str:
- return pwd_context.hash(password)
+ return refresh_token
diff --git a/backend/app/crud.py b/backend/app/crud.py
deleted file mode 100644
index 905bf48724..0000000000
--- a/backend/app/crud.py
+++ /dev/null
@@ -1,54 +0,0 @@
-import uuid
-from typing import Any
-
-from sqlmodel import Session, select
-
-from app.core.security import get_password_hash, verify_password
-from app.models import Item, ItemCreate, User, UserCreate, UserUpdate
-
-
-def create_user(*, session: Session, user_create: UserCreate) -> User:
- db_obj = User.model_validate(
- user_create, update={"hashed_password": get_password_hash(user_create.password)}
- )
- session.add(db_obj)
- session.commit()
- session.refresh(db_obj)
- return db_obj
-
-
-def update_user(*, session: Session, db_user: User, user_in: UserUpdate) -> Any:
- user_data = user_in.model_dump(exclude_unset=True)
- extra_data = {}
- if "password" in user_data:
- password = user_data["password"]
- hashed_password = get_password_hash(password)
- extra_data["hashed_password"] = hashed_password
- db_user.sqlmodel_update(user_data, update=extra_data)
- session.add(db_user)
- session.commit()
- session.refresh(db_user)
- return db_user
-
-
-def get_user_by_email(*, session: Session, email: str) -> User | None:
- statement = select(User).where(User.email == email)
- session_user = session.exec(statement).first()
- return session_user
-
-
-def authenticate(*, session: Session, email: str, password: str) -> User | None:
- db_user = get_user_by_email(session=session, email=email)
- if not db_user:
- return None
- if not verify_password(password, db_user.hashed_password):
- return None
- return db_user
-
-
-def create_item(*, session: Session, item_in: ItemCreate, owner_id: uuid.UUID) -> Item:
- db_item = Item.model_validate(item_in, update={"owner_id": owner_id})
- session.add(db_item)
- session.commit()
- session.refresh(db_item)
- return db_item
diff --git a/backend/app/email-templates/build/new_account.html b/backend/app/email-templates/build/new_account.html
deleted file mode 100644
index 344505033b..0000000000
--- a/backend/app/email-templates/build/new_account.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
|
|
|
| Full name | -Role | -Status | -Actions | -|
|---|---|---|---|---|
|
- |
- ))}
- ||||
|
- {user.full_name || "N/A"}
- {currentUser?.id === user.id && (
- |
- - {user.email} - | -{user.is_superuser ? "Superuser" : "User"} | -
- |
-
- |
-
| ID | -Title | -Description | -Actions | -
|---|---|---|---|
|
- |
- ))}
- |||
| {item.id} | -- {item.title} - | -- {item.description || "N/A"} - | -
- |
-