Skip to content

Commit

Permalink
feat: edit all typo in api and get the database schema
Browse files Browse the repository at this point in the history
  • Loading branch information
Musoye committed May 24, 2023
1 parent 2e17681 commit 950f6b2
Show file tree
Hide file tree
Showing 4 changed files with 135 additions and 14 deletions.
8 changes: 3 additions & 5 deletions api/views/projects.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/python3
""" objects that handle all default RestFul API actions for Users"""
""" objects that handle all default RestFul API actions for Projects"""
from models.project import Project
from models.task import Task
from models import storage
Expand All @@ -11,7 +11,6 @@
def get_projects():
"""
Retrieves the list of all project objects
or a specific project
"""
all_users = storage.all(Project).values()
list_users = []
Expand All @@ -34,7 +33,7 @@ def get_project(project_id):
strict_slashes=False)
def delete_project(project_id):
"""
Deletes a user Object
Deletes a project Object
"""

user = storage.get(Project, project_id)
Expand Down Expand Up @@ -92,8 +91,7 @@ def put_project(project_id):
@app_views.route('/projects/<project_id>/tasks', methods=['GET'], strict_slashes=False)
def get_all_projects_task(project_id):
"""
Retrieves the list of all tasks objects
with a specific project
Retrieves the all tasks of a specific project
"""
all_users = storage.all(Task).values()
list_users = []
Expand Down
6 changes: 2 additions & 4 deletions api/views/tasks.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/python3
""" objects that handle all default RestFul API actions for Users"""
from models.project import Project
""" objects that handle all default RestFul API actions for Tasks"""
from models.task import Task
from models import storage
from api.views import app_views
Expand All @@ -11,7 +10,6 @@
def get_tasks():
"""
Retrieves the list of all task objects
or a specific project
"""
all_users = storage.all(Task).values()
list_users = []
Expand Down Expand Up @@ -67,7 +65,7 @@ def post_task():

data = request.get_json()
if data.get('status') not in ['doing', 'todo', 'done']:
abort(400, description='The value os status should be doing, todo and done')
abort(400, description='The value of status should be doing, todo and done')
instance = Task(**data)
instance.save()
return make_response(jsonify(instance.to_dict()), 201)
Expand Down
8 changes: 3 additions & 5 deletions api/views/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
def get_users():
"""
Retrieves the list of all user objects
or a specific user
"""
all_users = storage.all(User).values()
list_users = []
Expand All @@ -22,7 +21,7 @@ def get_users():

@app_views.route('/users/<user_id>', methods=['GET'], strict_slashes=False)
def get_user(user_id):
""" Retrieves an user """
""" Retrieves a user """
user = storage.get(User, user_id)
if not user:
abort(404)
Expand All @@ -34,7 +33,7 @@ def get_user(user_id):
strict_slashes=False)
def delete_user(user_id):
"""
Deletes a user Object
Delete a user Object
"""

user = storage.get(User, user_id)
Expand Down Expand Up @@ -92,8 +91,7 @@ def put_user(user_id):
@app_views.route('/users/<user_id>/projects', methods=['GET'], strict_slashes=False)
def get_all_user_projects(user_id):
"""
Retrieves the list of all user objects
with a specific project
Retrieves all projects of a specific user
"""
all_users = storage.all(Project).values()
list_users = []
Expand Down
127 changes: 127 additions & 0 deletions setup.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
-- MySQL dump 10.13 Distrib 8.0.33, for Linux (x86_64)
--
-- Host: localhost Database: time_master
-- ------------------------------------------------------
-- Server version 8.0.33-0ubuntu0.22.04.2

/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!50503 SET NAMES utf8mb4 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

--
-- Table structure for table `projects`
--

DROP TABLE IF EXISTS `projects`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `projects` (
`user_id` varchar(60) NOT NULL,
`name` varchar(128) NOT NULL,
`description` varchar(128) DEFAULT NULL,
`sent` tinyint(1) DEFAULT NULL,
`expiry_date` datetime DEFAULT NULL,
`is_priority` tinyint(1) DEFAULT NULL,
`id` varchar(60) NOT NULL,
`created_at` datetime DEFAULT NULL,
`updated_at` datetime DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `user_id` (`user_id`),
CONSTRAINT `projects_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Dumping data for table `projects`
--

LOCK TABLES `projects` WRITE;
/*!40000 ALTER TABLE `projects` DISABLE KEYS */;
INSERT INTO `projects` VALUES ('d7d05a45-edf8-4c2e-90f1-502c205bca77','the odion project',NULL,0,'2023-05-26 14:55:39',0,'abd23c36-ba06-44fe-bd38-44d921c6cdb6','2023-05-23 13:57:32','2023-05-23 15:01:23');
/*!40000 ALTER TABLE `projects` ENABLE KEYS */;
UNLOCK TABLES;

--
-- Table structure for table `tasks`
--

DROP TABLE IF EXISTS `tasks`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `tasks` (
`project_id` varchar(60) NOT NULL,
`user_id` varchar(60) NOT NULL,
`name` varchar(128) NOT NULL,
`status` varchar(16) NOT NULL,
`description` varchar(128) DEFAULT NULL,
`sent` tinyint(1) DEFAULT NULL,
`expiry_date` datetime DEFAULT NULL,
`is_priority` tinyint(1) DEFAULT NULL,
`id` varchar(60) NOT NULL,
`created_at` datetime DEFAULT NULL,
`updated_at` datetime DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `project_id` (`project_id`),
KEY `user_id` (`user_id`),
CONSTRAINT `tasks_ibfk_1` FOREIGN KEY (`project_id`) REFERENCES `projects` (`id`),
CONSTRAINT `tasks_ibfk_2` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Dumping data for table `tasks`
--

LOCK TABLES `tasks` WRITE;
/*!40000 ALTER TABLE `tasks` DISABLE KEYS */;
INSERT INTO `tasks` VALUES ('abd23c36-ba06-44fe-bd38-44d921c6cdb6','d7d05a45-edf8-4c2e-90f1-502c205bca77','The interface','doing',NULL,0,'2023-05-26 15:03:18',0,'21cc7e32-a02d-49ec-83c7-0d4899490f8e','2023-05-23 14:03:33','2023-05-23 15:05:01');
/*!40000 ALTER TABLE `tasks` ENABLE KEYS */;
UNLOCK TABLES;

--
-- Table structure for table `users`
--

DROP TABLE IF EXISTS `users`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `users` (
`email` varchar(128) NOT NULL,
`password` varchar(128) NOT NULL,
`first_name` varchar(128) DEFAULT NULL,
`last_name` varchar(128) DEFAULT NULL,
`is_suscribe` tinyint(1) DEFAULT NULL,
`id` varchar(60) NOT NULL,
`created_at` datetime DEFAULT NULL,
`updated_at` datetime DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Dumping data for table `users`
--

LOCK TABLES `users` WRITE;
/*!40000 ALTER TABLE `users` DISABLE KEYS */;
INSERT INTO `users` VALUES ('[email protected]','5f62509bdf2ec0331ee55427f4b80f7d',NULL,NULL,1,'d7d05a45-edf8-4c2e-90f1-502c205bca77','2023-05-23 13:55:51','2023-05-23 14:56:40');
/*!40000 ALTER TABLE `users` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

-- Dump completed on 2023-05-24 5:08:03

0 comments on commit 950f6b2

Please sign in to comment.