Merge branch 'main' of https://github.com/nmluci/StellarCoffee

nmluci · Dec 16, 2021 · 708cdbc · 708cdbc
2 parents 84acefd + 03222e2
commit 708cdbc
Show file tree

Hide file tree

Showing 46 changed files with 130 additions and 349 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <h1 align="center">Stellar Coffee</h1>
-<img src="./docs/StellarCoffee.png"> 
+<img src="./docs/StellarCoffee2.png"> 
 <h2 align="center">Our Data Structure Course's Final Project</h2>
 </br>
 
@@ -55,4 +55,6 @@ It's actually consist of 2 Core Part, [FrontEnd](https://github.com/kompiangg/St
 | SQLAlchemy       | Provides Database Interface Abstraction for Python   |
 
 # Full Team
-[Fuyuna](https://github.com/nmluci) [Pangpang](https://github.com/kompiangg)
+| [Fuyuna](https://github.com/nmluci) | [Pangpang](https://github.com/kompiangg) | [Ngakan](https://github.com/NgakanWidyasprana) | [Diah](https://github.com/diahpramesti) | [James Fang](https://github.com/jamesfangyauw) | [Audy](https://github.com/diahpramesti) | 
+--------------------------------------|------------------------------------------|------------------------------------------------|-----------------------------------------|------------------------------------------------|------------------------------------------
+| Project Lead, Back-End, DBA         | Full-Stack DevOps                        | Full-Stack                                     | Front-End                               | Front-End                                      | Front-End        
diff --git a/app/order/controllers.py b/app/order/controllers.py
@@ -37,7 +37,7 @@
 def todaySpecialty():
    try:
       todaySpecials = generateTodaySpecialty()
-      return make_response(SuccessResponse(data=todaySpecials).toDict())
+      return make_response(SuccessResponse(data=[todaySpecials]).toDict())
    except Exception as e:
       return make_response(FailedResponse(errorMessage=str(e)).toDict(), 500)
 

diff --git a/app/order/models.py b/app/order/models.py
@@ -1,5 +1,9 @@
+from typing import Dict, List, Mapping
+
 from dataclasses import dataclass
 from datetime import datetime
+
+from sqlalchemy.util.langhelpers import monkeypatch_proxied_specials
 from app.baseModel import db
 
 class Orders(db.Model):
@@ -69,6 +73,44 @@ def delete(self):
 
     def update(self):
         db.session.commit()
+
+class Graph:
+	def __init__(self, vertices: List[List[int]], alias: List):
+		self.alias = alias
+		self.days = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
+		self.V = vertices
+		self.graph = [[0 for column in range(vertices)] for row in range(vertices)]
+
+	def isSafe(self, v, colour, c):
+		for i in range(self.V):
+			if self.graph[v][i] == 1 and colour[i] == c:
+				return False
+		return True
+
+	def graphColourUtil(self, m, colour, v):
+		if v == self.V:
+			return True
+
+		for c in range(1, m + 1):
+			if self.isSafe(v, colour, c) == True:
+				colour[v] = c
+				if self.graphColourUtil(m, colour, v + 1) == True:
+					return True
+				colour[v] = 0
+
+	def graphColouring(self, m: int) -> Dict:
+		mappedColour = dict(list())
+		colour = [0] * self.V
+		if self.graphColourUtil(m, colour, 0) == None:
+			return False
+
+		for idx, c in enumerate(colour):
+			if not mappedColour.get(c):
+				mappedColour[c] = [self.alias[idx]]
+			else:
+				mappedColour[c].append(self.alias[idx])
+
+		return mappedColour
 
 @dataclass
 class EventData:
@@ -139,16 +181,14 @@ class TodaySpecialData:
     item_id: int
     name: str
     price: int
-    total_price: int
-    quantity: int
+    path: str
 
     def toDict(cls):
         return {
             "id": cls.item_id,
             "name": cls.name,
             "price": cls.price,
-            "total_price": cls.total_price,
-            "quantity": cls.quantity
+            "pics": cls.path
         }
 
 @dataclass

diff --git a/app/order/services.py b/app/order/services.py
@@ -3,22 +3,54 @@
 
 from datetime import datetime
 
-from sqlalchemy.sql.operators import notbetween_op
 from app.inventory.models import Inventory
 
-from app.order.models import Events, OrderItems, Orders, TodayEventData, TodaySpecialData, UserOrder, Order, generalHistory, EventData
+from app.order.models import Events, OrderItems, Orders, TodayEventData, TodaySpecialData, UserOrder, Order, generalHistory, EventData, Graph
 from app.userdata.models import User
 from app.baseModel import db
 
 def generateTodaySpecialty() -> List[TodaySpecialData]:
-    todaySpecials = db.session.query(Inventory).filter(Inventory.stock != 0).all()
-    if not todaySpecials:
-        raise Exception("no specials menu today")
-    return list(TodaySpecialData(
-        item.id,
-        item.name,
-        item.price
-    ).toDict() for item in todaySpecials[:5])
+    aliases = ["Espresso", "Cappucino", 
+		   "Cafe Latte", "Americano", 
+		   "Vanilla Latte", "French Fries", 
+		   "Croissant", "Deluxe Burger",
+		   "Potato Wedges", "Cheese Burger",
+		   "Lemon Tea", "Taro Latte", "Chocolate Latte", "Lychee Tea", "Matcha Latte"]
+
+    g = Graph(15, aliases)
+    g.graph =	[
+		[ 0 ,0 ,0 ,0 ,1 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,1 ,0 ,1 ],
+		[ 0 ,0 ,1 ,0 ,0 ,0 ,0 ,1 ,1 ,0 ,1 ,0 ,0 ,1 ,0 ],
+		[ 1 ,1 ,0 ,0 ,1 ,0 ,1 ,0 ,0 ,0 ,1 ,0 ,1 ,1 ,1 ],
+		[ 1 ,1 ,1 ,0 ,0 ,0 ,1 ,1 ,1 ,1 ,0 ,0 ,1 ,0 ,0 ],
+		[ 1 ,1 ,0 ,1 ,0 ,0 ,0 ,1 ,1 ,0 ,1 ,1 ,1 ,0 ,0 ], 
+		[ 1 ,1 ,0 ,1 ,1 ,0 ,0 ,1 ,0 ,0 ,1 ,1 ,0 ,0 ,1 ],
+		[ 0 ,1 ,0 ,1 ,1 ,0 ,0 ,1 ,1 ,1 ,1 ,0 ,0 ,0 ,0 ],
+		[ 1 ,0 ,1 ,0 ,1 ,1 ,1 ,0 ,1 ,0 ,0 ,0 ,0 ,1 ,0 ],
+		[ 1 ,0 ,0 ,1 ,0 ,1 ,0 ,0 ,0 ,1 ,0 ,1 ,0 ,1 ,1 ],
+		[ 1 ,1 ,1 ,1 ,0 ,0 ,0 ,0 ,1 ,0 ,1 ,0 ,1 ,1 ,1 ],
+		[ 1 ,0 ,0 ,0 ,1 ,0 ,0 ,0 ,1 ,1 ,0 ,1 ,0 ,0 ,0 ],
+		[ 1 ,1 ,0 ,1 ,1 ,1 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,1 ,0 ],
+		[ 1 ,1 ,1 ,1 ,0 ,0 ,0 ,0 ,1 ,0 ,0 ,1 ,0 ,1 ,0 ],
+		[ 0 ,0 ,1 ,0 ,0 ,1 ,1 ,0 ,1 ,1 ,1 ,0 ,0 ,0 ,1 ],
+		[ 1 ,0 ,1 ,0 ,0 ,0 ,0 ,0 ,1 ,0 ,1 ,0 ,0 ,0 ,0 ],
+    ]
+
+    allSpeciality = g.graphColouring(5)
+    for key in allSpeciality.keys():
+        detailed = list()
+        for itm in allSpeciality[key]:
+            print(itm)
+            specialItem = db.session.query(Inventory).filter(Inventory.name==itm).first()
+            detailed.append(TodaySpecialData(
+                item_id=specialItem.id,
+                name=specialItem.name,
+                price=specialItem.price,
+                path=specialItem.path_picture
+            ))
+        allSpeciality[key] = detailed
+
+    return allSpeciality
 
 def generateTodayEvents() -> List[TodayEventData]:
     todayDate = datetime.now().date()

diff --git a/data_insert.py b/data_insert.py
@@ -16,87 +16,87 @@
     },
     {
         "menuId": 2,
-        "namaMenu": "Americano",
-        "hargaMenu": 24000,
-        "pathGambar": "/assets/img/menu/americano.jpg"
+        "namaMenu": "Cappucino",
+        "hargaMenu": 25000,
+        "pathGambar": "/assets/img/menu/cappucino.jpg"
     },
     {
         "menuId": 3,
-        "namaMenu": "Cappucino",
+        "namaMenu": "Cafe Latte",
         "hargaMenu": 25000,
-        "pathGambar": "/assets/img/menu/cappucino.jpg"
+        "pathGambar": "/assets/img/menu/cafe-latte.jpg"
     },
     {
         "menuId": 4,
-        "namaMenu": "Vanilla Latte",
-        "hargaMenu": 27000,
-        "pathGambar": "/assets/img/menu/vanilla-latte.jpg"
+        "namaMenu": "Americano",
+        "hargaMenu": 24000,
+        "pathGambar": "/assets/img/menu/americano.jpg"
     },
     {
         "menuId": 5,
-        "namaMenu": "Cafe Latte",
-        "hargaMenu": 25000,
-        "pathGambar": "/assets/img/menu/cafe-latte.jpg"
+        "namaMenu": "Vanilla Latte",
+        "hargaMenu": 27000,
+        "pathGambar": "/assets/img/menu/vanilla-latte.jpg"
     },
     {
         "menuId": 6,
-        "namaMenu": "Lemon Tea",
+        "namaMenu": "French Fries",
         "hargaMenu": 17000,
-        "pathGambar": "/assets/img/menu/lemon-tea.jpg"
+        "pathGambar": "/assets/img/menu/french-fries.jpg"
     },
     {
         "menuId": 7,
-        "namaMenu": "Lychee Tea",
-        "hargaMenu": 20000,
-        "pathGambar": "/assets/img/menu/lychee-tea.jpg"
+        "namaMenu": "Croissant",
+        "hargaMenu": 25000,
+        "pathGambar": "/assets/img/menu/croissant.jpg"
     },
     {
         "menuId": 8,
-        "namaMenu": "Taro Latte",
-        "hargaMenu": 20000,
-        "pathGambar": "/assets/img/menu/taro-latte.jpg"
+        "namaMenu": "Deluxe Burger",
+        "hargaMenu": 50000,
+        "pathGambar": "/assets/img/menu/deluxe-burger.jpg"
     },
     {
         "menuId": 9,
-        "namaMenu": "Matcha Latte",
-        "hargaMenu": 25000,
-        "pathGambar": "/assets/img/menu/matcha-latte.jpg"
+        "namaMenu": "Potato Wedges",
+        "hargaMenu": 20000,
+        "pathGambar": "/assets/img/menu/potato-wedges.jpg"
     },
     {
         "menuId": 10,
-        "namaMenu": "Chocolate Latte",
-        "hargaMenu": 25000,
-        "pathGambar": "/assets/img/menu/chocolate-latte.jpg"
+        "namaMenu": "Cheese Burger",
+        "hargaMenu": 45000,
+        "pathGambar": "/assets/img/menu/cheese-burger.jpg"
     },
     {
         "menuId": 11,
-        "namaMenu": "French Fries",
+        "namaMenu": "Lemon Tea",
         "hargaMenu": 17000,
-        "pathGambar": "/assets/img/menu/french-fries.jpg"
+        "pathGambar": "/assets/img/menu/lemon-tea.jpg"
     },
     {
         "menuId": 12,
-        "namaMenu": "Potato Wedges",
+        "namaMenu": "Taro Latte",
         "hargaMenu": 20000,
-        "pathGambar": "/assets/img/menu/potato-wedges.jpg"
+        "pathGambar": "/assets/img/menu/taro-latte.jpg"
     },
     {
         "menuId": 13,
-        "namaMenu": "Croissant",
+        "namaMenu": "Chocolate Latte",
         "hargaMenu": 25000,
-        "pathGambar": "/assets/img/menu/croissant.jpg"
+        "pathGambar": "/assets/img/menu/chocolate-latte.jpg"
     },
     {
         "menuId": 14,
-        "namaMenu": "Cheese Burger",
-        "hargaMenu": 45000,
-        "pathGambar": "/assets/img/menu/cheese-burger.jpg"
+        "namaMenu": "Lychee Tea",
+        "hargaMenu": 20000,
+        "pathGambar": "/assets/img/menu/lychee-tea.jpg"
     },
     {
         "menuId": 15,
-        "namaMenu": "Deluxe Burger",
-        "hargaMenu": 50000,
-        "pathGambar": "/assets/img/menu/deluxe-burger.jpg"
+        "namaMenu": "Matcha Latte",
+        "hargaMenu": 25000,
+        "pathGambar": "/assets/img/menu/matcha-latte.jpg"
     }
 ]
 

diff --git a/docs/Flowcharts PNG/addItem.png b/docs/Flowcharts PNG/addItem.png
diff --git a/docs/Flowcharts PNG/addMember.png b/docs/Flowcharts PNG/addMember.png
diff --git a/docs/Flowcharts PNG/addPoint.png b/docs/Flowcharts PNG/addPoint.png
diff --git a/docs/Flowcharts PNG/appendItem.png b/docs/Flowcharts PNG/appendItem.png
diff --git a/docs/Flowcharts PNG/buyItem.png b/docs/Flowcharts PNG/buyItem.png
diff --git a/docs/Flowcharts PNG/generateHash.png b/docs/Flowcharts PNG/generateHash.png
diff --git a/docs/Flowcharts PNG/initMembership.png b/docs/Flowcharts PNG/initMembership.png
diff --git a/docs/Flowcharts PNG/initStorage.png b/docs/Flowcharts PNG/initStorage.png
diff --git a/docs/Flowcharts PNG/main.png b/docs/Flowcharts PNG/main.png
diff --git a/docs/Flowcharts PNG/manageMembership.png b/docs/Flowcharts PNG/manageMembership.png
diff --git a/docs/Flowcharts PNG/manageStorage.png b/docs/Flowcharts PNG/manageStorage.png
diff --git a/docs/Flowcharts PNG/pay.png b/docs/Flowcharts PNG/pay.png
diff --git a/docs/Flowcharts PNG/registerMember.png b/docs/Flowcharts PNG/registerMember.png
diff --git a/docs/Flowcharts PNG/removeItem.png b/docs/Flowcharts PNG/removeItem.png
diff --git a/docs/Flowcharts PNG/returnItem.png b/docs/Flowcharts PNG/returnItem.png
diff --git a/docs/Flowcharts PNG/revokeMember.png b/docs/Flowcharts PNG/revokeMember.png
diff --git a/docs/Flowcharts PNG/updateMembership.png b/docs/Flowcharts PNG/updateMembership.png
diff --git a/docs/Flowcharts/InitMembership.svg b/docs/Flowcharts/InitMembership.svg
diff --git a/docs/Flowcharts/InitStorage.svg b/docs/Flowcharts/InitStorage.svg
diff --git a/docs/Flowcharts/addItem.svg b/docs/Flowcharts/addItem.svg
diff --git a/docs/Flowcharts/addMember.svg b/docs/Flowcharts/addMember.svg
diff --git a/docs/Flowcharts/addPoint.svg b/docs/Flowcharts/addPoint.svg
diff --git a/docs/Flowcharts/appendItem.svg b/docs/Flowcharts/appendItem.svg
diff --git a/docs/Flowcharts/buyItem.svg b/docs/Flowcharts/buyItem.svg
diff --git a/docs/Flowcharts/generateHash.svg b/docs/Flowcharts/generateHash.svg
diff --git a/docs/Flowcharts/main.svg b/docs/Flowcharts/main.svg
diff --git a/docs/Flowcharts/manageMember.svg b/docs/Flowcharts/manageMember.svg
diff --git a/docs/Flowcharts/manageStorage.svg b/docs/Flowcharts/manageStorage.svg
diff --git a/docs/Flowcharts/pay.svg b/docs/Flowcharts/pay.svg
diff --git a/docs/Flowcharts/registerMember.svg b/docs/Flowcharts/registerMember.svg
diff --git a/docs/Flowcharts/removeItem.svg b/docs/Flowcharts/removeItem.svg
diff --git a/docs/Flowcharts/returnItem.svg b/docs/Flowcharts/returnItem.svg
diff --git a/docs/Flowcharts/revokeMember.svg b/docs/Flowcharts/revokeMember.svg
diff --git a/docs/Flowcharts/updateMembership.svg b/docs/Flowcharts/updateMembership.svg
diff --git a/docs/KissatenBanner.png b/docs/KissatenBanner.png
diff --git a/docs/Stellar Coffee.png b/docs/Stellar Coffee.png
diff --git a/docs/StellarCoffee2.png b/docs/StellarCoffee2.png
diff --git a/docs/StellarCoffee_Detail.png b/docs/StellarCoffee_Detail.png
diff --git a/docs/flowchart.drawio.svg b/docs/flowchart.drawio.svg