diff --git a/.gitea/workflows/dev_pipeline.yaml b/.gitea/workflows/dev_pipeline.yaml index 7eeab0b..93d918d 100644 --- a/.gitea/workflows/dev_pipeline.yaml +++ b/.gitea/workflows/dev_pipeline.yaml @@ -7,8 +7,6 @@ on: jobs: BuildAndTest: runs-on: ubuntu-latest - container: - image: catthehacker/ubuntu:act-22.04 steps: - name: List Base info 👓 run: | @@ -18,19 +16,6 @@ jobs: echo "${{ gitea.workspace }} is a workspace folder" - name: Check out repo code 📝 uses: actions/checkout@v4 - - name: Set up PostgreSQL 🐘 - run: | - sudo apt-get update - sudo apt-get install -y postgresql - sudo systemctl restart postgresql.service - - name: Create User - run: | - sudo -u postgres psql --command="CREATE USER developer PASSWORD 'magazinchik_forever'" - - name: Init db 📜 - env: - PGPASSWORD: magazinchik_forever - run: | - sudo psql -h localhost -U developer -f ${{ gitea.workspace }}/Db/_localhost-2024_07_27_12_51_02-dump.sql - name: Setup .NET 🛠️ uses: actions/setup-dotnet@v3 with: diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index f4f086b..7b4948b 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -8,5 +8,12 @@ jdbc:postgresql://localhost:5432/ $ProjectFileDir$ + + postgresql + true + org.postgresql.Driver + jdbc:postgresql://eva00.vasich:5432/postgres + $ProjectFileDir$ + \ No newline at end of file diff --git a/Db/_localhost-2024_07_27_12_51_02-dump.sql b/Db/_localhost-2024_07_27_12_51_02-dump.sql deleted file mode 100644 index 8e9245c..0000000 --- a/Db/_localhost-2024_07_27_12_51_02-dump.sql +++ /dev/null @@ -1,371 +0,0 @@ --- --- PostgreSQL database dump --- - --- Dumped from database version 15.2 --- Dumped by pg_dump version 15.2 - -SET statement_timeout = 0; -SET lock_timeout = 0; -SET idle_in_transaction_session_timeout = 0; -SET client_encoding = 'UTF8'; -SET standard_conforming_strings = on; -SELECT pg_catalog.set_config('search_path', '', false); -SET check_function_bodies = false; -SET xmloption = content; -SET client_min_messages = warning; -SET row_security = off; - --- --- Name: Yuna; Type: DATABASE; Schema: -; Owner: developer --- - -CREATE DATABASE "Yuna" WITH TEMPLATE = template0 ENCODING = 'UTF8' LOCALE_PROVIDER = libc LOCALE = 'Russian_Russia.1251'; - - -ALTER DATABASE "Yuna" OWNER TO developer; - -\connect "Yuna" - -SET statement_timeout = 0; -SET lock_timeout = 0; -SET idle_in_transaction_session_timeout = 0; -SET client_encoding = 'UTF8'; -SET standard_conforming_strings = on; -SELECT pg_catalog.set_config('search_path', '', false); -SET check_function_bodies = false; -SET xmloption = content; -SET client_min_messages = warning; -SET row_security = off; - -SET default_tablespace = ''; - -SET default_table_access_method = heap; - --- --- Name: Yuna_Devices; Type: TABLE; Schema: public; Owner: postgres --- - -CREATE TABLE public."Yuna_Devices" ( - "Id" bigint NOT NULL, - "Name" character varying(128) NOT NULL, - "Description" character varying(255), - "DeviceUrl" character varying(255), - "UserId" bigint NOT NULL, - "IsDeleted" boolean DEFAULT false NOT NULL -); - - -ALTER TABLE public."Yuna_Devices" OWNER TO postgres; - --- --- Name: Yuna_Devices_Id_seq; Type: SEQUENCE; Schema: public; Owner: postgres --- - -CREATE SEQUENCE public."Yuna_Devices_Id_seq" - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - -ALTER TABLE public."Yuna_Devices_Id_seq" OWNER TO postgres; - --- --- Name: Yuna_Devices_Id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres --- - -ALTER SEQUENCE public."Yuna_Devices_Id_seq" OWNED BY public."Yuna_Devices"."Id"; - - --- --- Name: Yuna_Props; Type: TABLE; Schema: public; Owner: postgres --- - -CREATE TABLE public."Yuna_Props" ( - "Id" bigint NOT NULL, - "Name" character varying(100) NOT NULL, - "MeasureName" character varying(255), - "JsonValueName" character varying(255), - "Type" smallint -); - - -ALTER TABLE public."Yuna_Props" OWNER TO postgres; - --- --- Name: Yuna_Props_Id_seq; Type: SEQUENCE; Schema: public; Owner: postgres --- - -CREATE SEQUENCE public."Yuna_Props_Id_seq" - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - -ALTER TABLE public."Yuna_Props_Id_seq" OWNER TO postgres; - --- --- Name: Yuna_Props_Id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres --- - -ALTER SEQUENCE public."Yuna_Props_Id_seq" OWNED BY public."Yuna_Props"."Id"; - - --- --- Name: Yuna_Props_In_Devices; Type: TABLE; Schema: public; Owner: postgres --- - -CREATE TABLE public."Yuna_Props_In_Devices" ( - "Id" bigint NOT NULL, - "PropId" bigint NOT NULL, - "DeviceId" bigint NOT NULL -); - - -ALTER TABLE public."Yuna_Props_In_Devices" OWNER TO postgres; - --- --- Name: Yuna_Props_In_Devices_Id_seq; Type: SEQUENCE; Schema: public; Owner: postgres --- - -CREATE SEQUENCE public."Yuna_Props_In_Devices_Id_seq" - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - -ALTER TABLE public."Yuna_Props_In_Devices_Id_seq" OWNER TO postgres; - --- --- Name: Yuna_Props_In_Devices_Id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres --- - -ALTER SEQUENCE public."Yuna_Props_In_Devices_Id_seq" OWNED BY public."Yuna_Props_In_Devices"."Id"; - - --- --- Name: Yuna_Users; Type: TABLE; Schema: public; Owner: postgres --- - -CREATE TABLE public."Yuna_Users" ( - "Id" bigint NOT NULL, - "Username" character varying(32) NOT NULL, - "HashedPassword" character varying(255) NOT NULL, - "IsAdmin" boolean NOT NULL -); - - -ALTER TABLE public."Yuna_Users" OWNER TO postgres; - --- --- Name: Yuna_Users_Id_seq; Type: SEQUENCE; Schema: public; Owner: postgres --- - -CREATE SEQUENCE public."Yuna_Users_Id_seq" - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - -ALTER TABLE public."Yuna_Users_Id_seq" OWNER TO postgres; - --- --- Name: Yuna_Users_Id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres --- - -ALTER SEQUENCE public."Yuna_Users_Id_seq" OWNED BY public."Yuna_Users"."Id"; - - --- --- Name: Yuna_Devices Id; Type: DEFAULT; Schema: public; Owner: postgres --- - -ALTER TABLE ONLY public."Yuna_Devices" ALTER COLUMN "Id" SET DEFAULT nextval('public."Yuna_Devices_Id_seq"'::regclass); - - --- --- Name: Yuna_Props Id; Type: DEFAULT; Schema: public; Owner: postgres --- - -ALTER TABLE ONLY public."Yuna_Props" ALTER COLUMN "Id" SET DEFAULT nextval('public."Yuna_Props_Id_seq"'::regclass); - - --- --- Name: Yuna_Props_In_Devices Id; Type: DEFAULT; Schema: public; Owner: postgres --- - -ALTER TABLE ONLY public."Yuna_Props_In_Devices" ALTER COLUMN "Id" SET DEFAULT nextval('public."Yuna_Props_In_Devices_Id_seq"'::regclass); - - --- --- Name: Yuna_Users Id; Type: DEFAULT; Schema: public; Owner: postgres --- - -ALTER TABLE ONLY public."Yuna_Users" ALTER COLUMN "Id" SET DEFAULT nextval('public."Yuna_Users_Id_seq"'::regclass); - - --- --- Data for Name: Yuna_Devices; Type: TABLE DATA; Schema: public; Owner: postgres --- - -INSERT INTO public."Yuna_Devices" ("Id", "Name", "Description", "DeviceUrl", "UserId", "IsDeleted") VALUES (9, 'Test Device', 'Test descr', 'sdfsdfsdfsdf', 8, false); -INSERT INTO public."Yuna_Devices" ("Id", "Name", "Description", "DeviceUrl", "UserId", "IsDeleted") VALUES (6, 'TenkiChan', 'Supa Weather', 'http://192.168.1.89/sensors', 8, false); -INSERT INTO public."Yuna_Devices" ("Id", "Name", "Description", "DeviceUrl", "UserId", "IsDeleted") VALUES (3, 'Test Device', 'Test Description', 'Test Urldfg', 1, true); -INSERT INTO public."Yuna_Devices" ("Id", "Name", "Description", "DeviceUrl", "UserId", "IsDeleted") VALUES (8, 'Test Devicedfgdfgdfgf', 'Test Description', 'Test Url11111111', 1, true); -INSERT INTO public."Yuna_Devices" ("Id", "Name", "Description", "DeviceUrl", "UserId", "IsDeleted") VALUES (11, 'string', 'string', 'ffffffffffdgghfghfghfgfghfgfghfg', 8, true); -INSERT INTO public."Yuna_Devices" ("Id", "Name", "Description", "DeviceUrl", "UserId", "IsDeleted") VALUES (12, 'Test Device', 'Test Description', 'Test Url', 1, true); -INSERT INTO public."Yuna_Devices" ("Id", "Name", "Description", "DeviceUrl", "UserId", "IsDeleted") VALUES (13, 'Test Device', 'Test Description', 'Test Url', 1, true); -INSERT INTO public."Yuna_Devices" ("Id", "Name", "Description", "DeviceUrl", "UserId", "IsDeleted") VALUES (10, 'string', 'string', 'fffdg', 8, true); -INSERT INTO public."Yuna_Devices" ("Id", "Name", "Description", "DeviceUrl", "UserId", "IsDeleted") VALUES (4, 'Test Device', 'Nyanyanyadfgdfgfdgfdg', 'Test Urldfgdfgdfgdf', 1, false); -INSERT INTO public."Yuna_Devices" ("Id", "Name", "Description", "DeviceUrl", "UserId", "IsDeleted") VALUES (1, 'strin111', 'strin', 'strindddd', 1, false); -INSERT INTO public."Yuna_Devices" ("Id", "Name", "Description", "DeviceUrl", "UserId", "IsDeleted") VALUES (14, 'Test Device', 'Test Description', 'Test Url', 1, false); - - --- --- Data for Name: Yuna_Props; Type: TABLE DATA; Schema: public; Owner: postgres --- - -INSERT INTO public."Yuna_Props" ("Id", "Name", "MeasureName", "JsonValueName", "Type") VALUES (1, 'test', 'test', 'test', 0); -INSERT INTO public."Yuna_Props" ("Id", "Name", "MeasureName", "JsonValueName", "Type") VALUES (2, 'test', 'test', 'test', 0); -INSERT INTO public."Yuna_Props" ("Id", "Name", "MeasureName", "JsonValueName", "Type") VALUES (3, 'Temp', 'C', 'string', 0); -INSERT INTO public."Yuna_Props" ("Id", "Name", "MeasureName", "JsonValueName", "Type") VALUES (4, 'string', 'string', 'string', 0); -INSERT INTO public."Yuna_Props" ("Id", "Name", "MeasureName", "JsonValueName", "Type") VALUES (5, 'strding', 'strding', 'strding', 0); -INSERT INTO public."Yuna_Props" ("Id", "Name", "MeasureName", "JsonValueName", "Type") VALUES (6, 'SupaTest', 'testing', 'sssss', 0); -INSERT INTO public."Yuna_Props" ("Id", "Name", "MeasureName", "JsonValueName", "Type") VALUES (7, 'test', 'test', 'test', 0); -INSERT INTO public."Yuna_Props" ("Id", "Name", "MeasureName", "JsonValueName", "Type") VALUES (8, 'Температура', '°C', 'temperature', 0); -INSERT INTO public."Yuna_Props" ("Id", "Name", "MeasureName", "JsonValueName", "Type") VALUES (9, 'Влажность', '%', 'humidity', 0); -INSERT INTO public."Yuna_Props" ("Id", "Name", "MeasureName", "JsonValueName", "Type") VALUES (10, 'Концентрация CO2', 'см³/м³', 'ppm', 0); -INSERT INTO public."Yuna_Props" ("Id", "Name", "MeasureName", "JsonValueName", "Type") VALUES (11, 'test', 'test', 'test', 0); - - --- --- Data for Name: Yuna_Props_In_Devices; Type: TABLE DATA; Schema: public; Owner: postgres --- - -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (1, 1, 1); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (21, 4, 1); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (22, 5, 1); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (32, 6, 1); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (39, 3, 1); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (40, 8, 6); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (41, 9, 6); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (42, 10, 6); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (43, 1, 9); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (44, 2, 9); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (45, 3, 9); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (46, 4, 9); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (47, 5, 10); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (48, 6, 10); -INSERT INTO public."Yuna_Props_In_Devices" ("Id", "PropId", "DeviceId") VALUES (49, 5, 11); - - --- --- Data for Name: Yuna_Users; Type: TABLE DATA; Schema: public; Owner: postgres --- - -INSERT INTO public."Yuna_Users" ("Id", "Username", "HashedPassword", "IsAdmin") VALUES (1, 'asd1', '2', true); -INSERT INTO public."Yuna_Users" ("Id", "Username", "HashedPassword", "IsAdmin") VALUES (2, 'test', '123', false); -INSERT INTO public."Yuna_Users" ("Id", "Username", "HashedPassword", "IsAdmin") VALUES (3, 'test', '123', false); -INSERT INTO public."Yuna_Users" ("Id", "Username", "HashedPassword", "IsAdmin") VALUES (4, 'test', '123', false); -INSERT INTO public."Yuna_Users" ("Id", "Username", "HashedPassword", "IsAdmin") VALUES (5, 'test', '123', false); -INSERT INTO public."Yuna_Users" ("Id", "Username", "HashedPassword", "IsAdmin") VALUES (6, 'test', '123', false); -INSERT INTO public."Yuna_Users" ("Id", "Username", "HashedPassword", "IsAdmin") VALUES (8, 'test1', 'EbvfS/o9GSL7wkbnix+BzMpCLJqfWqeTgimj3u9CknA=', false); -INSERT INTO public."Yuna_Users" ("Id", "Username", "HashedPassword", "IsAdmin") VALUES (7, 'vasich', 'V64zSeugpX/I4ZSqot7K0NQBOGdMNYNclXButwoXasI=', true); -INSERT INTO public."Yuna_Users" ("Id", "Username", "HashedPassword", "IsAdmin") VALUES (9, 'test', '123', false); - - --- --- Name: Yuna_Devices_Id_seq; Type: SEQUENCE SET; Schema: public; Owner: postgres --- - -SELECT pg_catalog.setval('public."Yuna_Devices_Id_seq"', 14, true); - - --- --- Name: Yuna_Props_Id_seq; Type: SEQUENCE SET; Schema: public; Owner: postgres --- - -SELECT pg_catalog.setval('public."Yuna_Props_Id_seq"', 11, true); - - --- --- Name: Yuna_Props_In_Devices_Id_seq; Type: SEQUENCE SET; Schema: public; Owner: postgres --- - -SELECT pg_catalog.setval('public."Yuna_Props_In_Devices_Id_seq"', 49, true); - - --- --- Name: Yuna_Users_Id_seq; Type: SEQUENCE SET; Schema: public; Owner: postgres --- - -SELECT pg_catalog.setval('public."Yuna_Users_Id_seq"', 9, true); - - --- --- Name: Yuna_Devices Yuna_Devices_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres --- - -ALTER TABLE ONLY public."Yuna_Devices" - ADD CONSTRAINT "Yuna_Devices_pkey" PRIMARY KEY ("Id"); - - --- --- Name: Yuna_Props_In_Devices Yuna_Props_In_Devices_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres --- - -ALTER TABLE ONLY public."Yuna_Props_In_Devices" - ADD CONSTRAINT "Yuna_Props_In_Devices_pkey" PRIMARY KEY ("Id"); - - --- --- Name: Yuna_Props Yuna_Props_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres --- - -ALTER TABLE ONLY public."Yuna_Props" - ADD CONSTRAINT "Yuna_Props_pkey" PRIMARY KEY ("Id"); - - --- --- Name: Yuna_Users_index_1; Type: INDEX; Schema: public; Owner: postgres --- - -CREATE UNIQUE INDEX "Yuna_Users_index_1" ON public."Yuna_Users" USING btree ("Id"); - - --- --- Name: Yuna_Props_In_Devices Yuna_Props_In_Devices_relation_2; Type: FK CONSTRAINT; Schema: public; Owner: postgres --- - -ALTER TABLE ONLY public."Yuna_Props_In_Devices" - ADD CONSTRAINT "Yuna_Props_In_Devices_relation_2" FOREIGN KEY ("DeviceId") REFERENCES public."Yuna_Devices"("Id") ON DELETE CASCADE; - - --- --- Name: Yuna_Props_In_Devices Yuna_Props_In_Devices_relation_3; Type: FK CONSTRAINT; Schema: public; Owner: postgres --- - -ALTER TABLE ONLY public."Yuna_Props_In_Devices" - ADD CONSTRAINT "Yuna_Props_In_Devices_relation_3" FOREIGN KEY ("PropId") REFERENCES public."Yuna_Props"("Id") ON DELETE CASCADE; - - --- --- Name: Yuna_Devices fk_user_id; Type: FK CONSTRAINT; Schema: public; Owner: postgres --- - -ALTER TABLE ONLY public."Yuna_Devices" - ADD CONSTRAINT fk_user_id FOREIGN KEY ("UserId") REFERENCES public."Yuna_Users"("Id"); - - --- --- PostgreSQL database dump complete --- - diff --git a/Db/init.sql b/Db/init.sql new file mode 100644 index 0000000..727de03 Binary files /dev/null and b/Db/init.sql differ diff --git a/Yuna.Website/Yuna.Website.Server/GlobalSettings.json b/Yuna.Website/Yuna.Website.Server/GlobalSettings.json index 21855de..beaa1f3 100644 --- a/Yuna.Website/Yuna.Website.Server/GlobalSettings.json +++ b/Yuna.Website/Yuna.Website.Server/GlobalSettings.json @@ -7,7 +7,7 @@ }, "ConnectionStrings": { "BarcodeService": "http://localhost:7799/barcode", - "Db": "User ID=developer;Password=magazinchik_forever;Server=localhost;Port=5432;Database=Yuna;Pooling=true;IncludeErrorDetail=true;", + "Db": "User ID=developer;Password=vasich_dev_pg;Server=eva00.vasich;Port=5432;Database=Yuna;Pooling=true;IncludeErrorDetail=true;", "UserDb": "User ID=developer;Password=magazinchik_forever;Server=localhost;Port=5432;Database=UserKeeper;Pooling=true;", "RabbitMq": "host=localhost;username=guest;password=guest", "Redis": "localhost:5002"