Skip to content

Commit

Permalink
🚀 🔖 “In individuals, insanity is rare; but in groups, parties, nation…
Browse files Browse the repository at this point in the history
…s, PSW firms and epochs, it is the rule.” (PSW-2020-ORG1#123)

* :white_check_mark: :construction: added integration test for getting prescriptions and updated model for prescriptions

* :iphone: Finished designing front view

* :sparkles: Implemented features for cities, states and addresses

* :white_check_mark: Implemented tests for states and cities

* :white_check_mark: Added unit test for addresses

* :white_check_mark: Updated integration test for registration

* :white_check_mark: Updated unit test for states

* :fire: Added methods to MedicationUsageReport to Backend

* :heavy_check_mark: :sparkles: implemented integration test and added controller and services for prescription

* :zap: Finished testing MedicationUsageReport

* :boom: started front for generating usage report

* :poop: :construction: RabbitMQ Service connected with database

* :white_check_mark: Added an integration test that was missing

* :hammer: RabbitMq support added. Has bugs tho

* :ambulance: RabbitMQ hotfix!

* Fixed bugs with ArrowUp/ArrowDown for changing floors and added relative paths to data for canvas objects

* :iphone: Designed frontend view for the prescription search

* Fixed bugs with unavailable icons when converted to .dll

* :iphone: Implemented frontend view for report search

* :iphone: Redesigned the frontend view for report and prescription search

* :iphone: Implemented frontend services

* :iphone: Implemented frontend view for displaying search results for prescriptions and reports

* :sparkles: Implemented email verification

* :recycle: Implemeted class for createing objects that are in relation with Patient

* :recycle: Refactored Patient and RegisteredUser

* :recycle: Implemented logic for saving InsurancePolicy to database

* :recycle: Refactored IPatientRepository

* :sparkle: Implemented logic for activating account

* :sparkle: Added methods to PatientSqlRepository

* :sparkle: Validation

* :iphone: Posting image

* :sparkle: DTO for posting image

* :sparkle: Migrations

* :sparkle: Migrations

* :sparkle: Frontend logic for image upload

* :white_check_mark: Added test

* :rotating_light: Added sonarcloud (#12)

* :memo: :ambulance: Readme hotfix

* :iphone: :construction: :added limit to number of components on frontend and started working on advanced search

* :construction: display rabbitMQ message

* :lipstick: modifications in front for usage report

* :adhesive_bandage: Updating database with new PharmacyNotifications

* :lipstick: upgrade message UI for multi-message displaying

* :bug: Fixed a bug where TypeScript dates and C# dates weren't the same

* :white_check_mark: Added tests for searching prescriptions and reports

* :construction: Added DTOs for prescription and report

* :white_check_mark: Updated the tests

* :sparkle: Implemented backend validation

* :fire: Removed unnecessary code

* :construction: Fixed frontend

* :recycle: Changed DoctorAdapter and PatientRegistrationAdapter

* :sparkles: Integrated database in GraphicEditor, added search for rooms and equipments

* :iphone: :construction: updated frontend validation and changed model for prescription search

* :sparkles: Implemented search medication by name

* :lipstick: CRUD operations for pharmacy notifications

* :bug: Fixed binding in SearchResultMedication

* :iphone: designed frontend for displaying search results and fixed frontend validation

* :iphone: fixed frontend validation for report search

* :lipstick: Modifications in vues

* :iphone: designed frontend for displaying report search results

* :construction:  Implemented simple search of reports

* :sparkles: Saving medical record

* :lipstick: Changed error message

* Removed unnecessary workflow (#13)

* :rotating_light: Added sonarcloud

* :fire: Removed unnecessary workflows

* :memo: Added Emoji guideline to readme

* :construction: added backend validation for prescriptions

* :construction: added backend validation for reports

* :construction: Updated MedicalRecordDTO and MedicalRecordAdapter

* :construction: Implemented simple search of prescriptions

* 💄Added files for dynamic drawing of Hospital 2 floors

* :whale: added dockerfile to backend, webApplication and webApplicationFrontend

* :whale: added docker-compose

* :construction: updated model builder for prescription

* :white_check_mark: added integration test for advanced search

* :construction: Implemented unit test for avanced prescription search

Moved DTO folder to Backend project

* :iphone: Changed table to angular material table, fixed default search date and doctor name

* :sparkles: Implemented advanced search for rooms, and  updated database

* :sparkles: Added validation for the search input

* :construction: Implemented service for advanced prescription search

* :sparkles: Implemented advanced search for medication

* :ambulance: Hotfix for ISA

* :zap: Updated advanced search for medication

* :sparkles: Partially implemented http request from GraphicEditor to backend

* :construction: Fixed mistakes that occured during the merge

* :rotating_light: Added sonarcloud test coverage for C# code (#17)

* :fire: Removed unnecessary code in prescription and report search services

* :sparkles: Fully implemented HTTP request in GraphicEditor

* :recycle: Refactored MySqlContext, medical record controllers and tests, feedback controller

* :construction: Refactored patient registration controller

* :sparkles: Added advanced search for equipment

* :white_check_mark: added test for checking if prescriptions are not found

* :bug: :hammer: Fixed bug when nothing is selected in table, renamed Rectt class and cleaned assign of same values

* :sparkles: Added an image to the medical record and finished the feature

* :white_check_mark: Implemented tests for advanced report search

* :recycle: Refactored method for uploading image

* :recycle: Moved DTOs of prescription and report to Backend project

* :bug: Fixed bugs for genders and storing path of images

* :construction: Added migration with image

* :construction: Created advanced report search backend and updated report search tests

* :construction: Updated advanced prescription search backend and updated prescription tests

* :lipstick: Designing Dean of Medicine panel

* :bulb: :art: Added documenation to services and applied clean code

* :lipstick: Modifications in front

* :poop: Added MedicationUsage layer. Fixed issues regarding DB not working.

* :construction: Fixed merge conflicts

* :ambulance: Database hotfix. Referencing context directly

* 📝 Updated database with data for Hospital2

* :hammer: Added Medication controller

* :lipstick: Started front for analyzing medication consumption

* :zap: Finished analyzing medication consumption

* :rotating_light: Added sonarcloud

* :construction: Changes to PharmacyNotification and filtering messages from queue

* :rotating_light: implemented unit tests for graphic_editorV1 branch

* Implemented patient registration, simple search of docs and presentation of medical record  (#25)

* :recycle: Changed properties to public and added migration for database

* :recycle: Fixed date for posting feedback

* :recycle: Added material button

* :iphone: Implement frontend page for registration

* :iphone: Page for registration

* :file_folder:  Added missing foreign keys to all entities needed for the medical record

Medication, Diagnosis, FamilyIllnessHistory, MedicalRecord, Symptoms, Therapy, Vaccines, Department, HospitalEquipment, Room, Doctor, Hospital, Patient, Specialization

* :file_folder: Filled the database with all entities needed for a medical record

* :white_check_mark: :heavy_check_mark: Added a test for getting a medical record by patient that passes

* :construction: Implemented a method in the repository for getting a medical record by id from the database and added it to the UnitOfWork

* :fire: Removed obsolete namespaces

* :iphone: Design registration page

* :construction: Added controller, adapter, dto and service for the medical record

* :iphone: Desing page for registration

* :iphone: :construction: Implemented frontend service, model, component for the medical record

* :iphone: Made the basic look of the medical record

* :iphone: designed frontend form for advanced search

* :iphone: added validation to advanced search for prescriptions

* :iphone: designed frontend form for report search and added validation

* :recycle: Refactored repository, service  and controller. Project is adapted for writing tests

* :construction:  Implemented backend logic for storing patient into database

* :white_check_mark: Implemented integration test

* :recycle: Refactored repository, controller and service so its suitable for testing

* :white_check_mark: Rewrote the test

* :white_check_mark: Added another test

* :white_check_mark: Updated the tests

* :construction: Changed DTO

* :construction: Started implementing frontend view

* :iphone: Implemented frontend view

* :sparkles: Implemented doctor service, controller and repository

* :white_check_mark: Implemented tests for patient registration

* :sparkles: Implemented patient regisration

* :iphone: Implemented patient registration frontend

* :iphone:  updated advanced search form design

* :white_check_mark: :construction: added integration test for getting prescriptions and updated model for prescriptions

* :iphone: Finished designing front view

* :sparkles: Implemented features for cities, states and addresses

* :white_check_mark: Implemented tests for states and cities

* :white_check_mark: Added unit test for addresses

* :white_check_mark: Updated integration test for registration

* :white_check_mark: Updated unit test for states

* :heavy_check_mark: :sparkles: implemented integration test and added controller and services for prescription

* :white_check_mark: Added an integration test that was missing

* :iphone: Designed frontend view for the prescription search

* :iphone: Implemented frontend view for report search

* :iphone: Redesigned the frontend view for report and prescription search

* :iphone: Implemented frontend services

* :iphone: Implemented frontend view for displaying search results for prescriptions and reports

* :sparkles: Implemented email verification

* :recycle: Implemeted class for createing objects that are in relation with Patient

* :recycle: Refactored Patient and RegisteredUser

* :recycle: Implemented logic for saving InsurancePolicy to database

* :recycle: Refactored IPatientRepository

* :sparkle: Implemented logic for activating account

* :sparkle: Added methods to PatientSqlRepository

* :sparkle: Validation

* :iphone: Posting image

* :sparkle: DTO for posting image

* :sparkle: Migrations

* :sparkle: Migrations

* :sparkle: Frontend logic for image upload

* :white_check_mark: Added test

* :iphone: :construction: :added limit to number of components on frontend and started working on advanced search

* :bug: Fixed a bug where TypeScript dates and C# dates weren't the same

* :white_check_mark: Added tests for searching prescriptions and reports

* :construction: Added DTOs for prescription and report

* :white_check_mark: Updated the tests

* :sparkle: Implemented backend validation

* :fire: Removed unnecessary code

* :construction: Fixed frontend

* :recycle: Changed DoctorAdapter and PatientRegistrationAdapter

* :iphone: :construction: updated frontend validation and changed model for prescription search

* :iphone: designed frontend for displaying search results and fixed frontend validation

* :iphone: fixed frontend validation for report search

* :iphone: designed frontend for displaying report search results

* :construction:  Implemented simple search of reports

* :sparkles: Saving medical record

* :lipstick: Changed error message

* :construction: added backend validation for prescriptions

* :construction: added backend validation for reports

* :construction: Updated MedicalRecordDTO and MedicalRecordAdapter

* :construction: Implemented simple search of prescriptions

* :construction: updated model builder for prescription

* :white_check_mark: added integration test for advanced search

* :construction: Implemented unit test for avanced prescription search

Moved DTO folder to Backend project

* :iphone: Changed table to angular material table, fixed default search date and doctor name

* :sparkles: Added validation for the search input

* :construction: Implemented service for advanced prescription search

* :construction: Fixed mistakes that occured during the merge

* :fire: Removed unnecessary code in prescription and report search services

* :recycle: Refactored MySqlContext, medical record controllers and tests, feedback controller

* :construction: Refactored patient registration controller

* :white_check_mark: added test for checking if prescriptions are not found

* :sparkles: Added an image to the medical record and finished the feature

* :white_check_mark: Implemented tests for advanced report search

* :recycle: Refactored method for uploading image

* :recycle: Moved DTOs of prescription and report to Backend project

* :bug: Fixed bugs for genders and storing path of images

* :construction: Added migration with image

* :construction: Created advanced report search backend and updated report search tests

* :construction: Updated advanced prescription search backend and updated prescription tests

* :bulb: :art: Added documenation to services and applied clean code

* :construction: Fixed merge conflicts

* :bug: Fixed bug with double classes

Co-authored-by: Bojan <[email protected]>
Co-authored-by: ognjen98 <[email protected]>
Co-authored-by: Bojan Vujic <[email protected]>
Co-authored-by: OakenKnight <[email protected]>
Co-authored-by: Jelena Vlajkov <[email protected]>

* :construction: Refactoring graphic editor

* :construction: Refactoring graphic editor (#27)

* :whale: Added docker files from Test repo to original MedbayTech repo

* :hammer: :bug: Fixed bugs and refactored code with graphic editor

* :whale: Dockerfiles updated

* :whale: Dockerfiles for Backend project updated

* :bug: Fixed conflicts with unit test

* :bug: Fixed bug with test project

* :bug: Fixed database tables and errors on frontend

* :hammer: Partially refactored graphic editor project

* :hammer: Graphic editor search modified

* :lipstick: Redesigned medication usage report front

* :lipstick: pharmacy notification crud operation

* :bug: Added additional information for AuxilaryRoom

* :poop: Merged new code

* :bug: :rotating_light: :white_check_mark: Fixed bug when using _context and runing room tests

* :bug: :hammer: Fixed bug with _context in DoctorService, code refactor

* :chart_with_upwards_trend: Deleted SonarCloud from github

* :bug: Resolve conflicts and bug

* :heavy_check_mark: Updated unit tests

* :heavy_check_mark: Tests updated

* :heavy_plus_sign: Adding Code Coverage dependency

* :twisted_rightwards_arrows: Meged all projects

* Added separate RabbitMQ service (#43)

* :poop: Buggy VS merge conflicts solved

* :rabbit2: :bug: Fixed bug with RabbitMQService

Co-authored-by: Marko <[email protected]>

* :twisted_rightwards_arrows: Resolved conflicts

* :twisted_rightwards_arrows: Merge appointment survey (#44)

* :recycle: Refactored model for Survey and SurveyQuestion

* :recycle:  Refactored model added QuestionType and SurveyAnswer

* :card_file_box: Added Repository for SurveyQuestion and filled the database with SuveryQuestion

* :construction: :iphone: Implemented frontend service, model, componenet for the survey

* :iphone: Made the basic look of the survey

* :construction: Added controller, adapter, dto and service for the survey and surveyQuestion

* :white_check_mark: Added a test for getting all active questions

* :pencil2: fixed grammar mistakes in suvrey frontend

* :white_check_mark: updated SurveyTest

* :white_check_mark: updated SurveyTest

* :construction: Implemented Survey service and controller  and postSurveyDTO

* :recycle: Refactored SurveyRepositorys and survey model

* 📁 Added missing foreign keys to all entities needed for the medical r…  …ecord  Medication, Diagnosis, FamilyIllnessHistory, MedicalRecord, Symptoms, Therapy, Vaccines, Department, HospitalEquipment, Room, Doctor, Hospital, Patient, Specialization

* :fire: deleted old migrations

* :white_check_mark: updated SurveyTest with CreateAppointment function

* :card_file_box: Added first Migration and updated MySqlContext and refactored appoitntment and HospitalEquipment for database

* :recycle: Refactored model for Survey and SurveyAnswer

* :recycle: refactored controller and service for survey

* :card_file_box: Deleted old and added new migrations and updated database

* :white_check_mark: updated integration test for survey

* :recycle: improved PostSurveyDTO

* :iphone: worked on frontend design, added model for postSurvey, deleted enum questionType, refactored survey.service, enviroment.ts and surveyQuestion.ts and worked on survey.component

* :sparkles: Added new classes, SurveyAnswerRepositorys, UnitTest for survey, dto for surveyanswers and appointment and answers models in frontend

* :card_file_box: deleted old migrations and added new one, added new data in surveyQuestions

* :iphone: worked on design for survey

* :recycle: refactored controller and service for survey

* :card_file_box: changed password in connection string

* :question:  i don't know

* :fire: deleted surveyAnswer model repository frontend model, deleted old migrations,  and deleted DTO from  WebApplication

* 🗃 added new migration and updated database

* ✨ added all DTOs from Web Application to Backend

* ✅ Improved integration and unit test for Survey

* :recycle: Copied only useful code from feature/Survey_results and removed all capital letters from model fields in frontend

* :construction: Moved DTO from Users to Utils

* :twisted_rightwards_arrows: Mergin survey after appointemnt with develop

* :twisted_rightwards_arrows: Merging with develop

Co-authored-by: Markovic Filip <[email protected]>

* :bug: Fixing a bug with SonarCloud

* Removed useless front junk (#46)

* :poop: Removed useless front junk

* :poop: Removed useless junk, again

* :recycle: Implemented Dependency Injection

* :recycle: Refactored tests

* :fire: Removed migration files

* :sparkles: Added HTTP file sharing 

* :construction: Started Http file sharing controller

* :sparkles: Started adding http file sharing support

* :sparkles: Added httpfilesharing

* :fire: REmoved migration files

* :bug: Database bug fix MedicationUsage

Co-authored-by: Kris98Wolf <[email protected]>
Co-authored-by: radovan-zupunski <[email protected]>

* :sparkles: Added GUI for appointment search

Co-authored-by: Stefan Aradjanin <[email protected]>

* :sparkles: Appointment scheduling

* :construction: Implemented logic for getting specializations and doctors by specializations

* :recycle: Refactored Specialization class

* :lipstick: Implemented frontend form for searching appointments

* :recycle: Clean code improvement

* :construction: Appointments scheduling

* :recycle: Test refactor

* :construction: Implemented frontend logic for scheduling appointments

* :recycle: Clen code improvement

* :recycle: Clean code improvement

* :white_check_mark: Tests for scheduling an appointment

* :sparkle: Scheduling an appointment

* :recycle: Test refactor

* :sparkle: Implemented appointment scheduling

* :construction: Implemented logic for getting specializations and doctors by specializations

* :recycle: Refactored Specialization class

* :lipstick: Implemented frontend form for searching appointments

* :recycle: Clean code improvement

* :construction: Appointments scheduling

* :recycle: Test refactor

* :construction: Implemented frontend logic for scheduling appointments

* :construction: Started working on frontend for scheduling appointments

* :recycle: Clen code improvement

* :recycle: Clean code improvement

* :white_check_mark: Tests for scheduling an appointment

* :sparkle: Scheduling an appointment

* :recycle: Test refactor

* :iphone: Finished frontend form for scheduling appointments

* :iphone: Split selection the specialization and the doctor in two different steps

* :sparkles: Finished implementing the appointment scheduling

* :fire: Removed migrations

* :bug: Fixed a bug where it wouldn't show all available schedules

Co-authored-by: Bojan <[email protected]>

* :fire: Removed Migrations, added to gitignore

* Made frontend more pretty (#57)

* :construction: Started Http file sharing controller

* :sparkles: Started adding http file sharing support

* :sparkles: Added httpfilesharing

* :fire: REmoved migration files

* :bug: Database bug fix MedicationUsage

* :art: Tidied up frontend

* :poop: Solved recursive reference problem

Co-authored-by: Kris98Wolf <[email protected]>
Co-authored-by: radovan-zupunski <[email protected]>

* :rotating_light: :white_check_mark: Added E2E test for posting feedback (#58)

Co-authored-by: Jelena Vlajkov <[email protected]>

* Feature web appointment recommendation (#56)

* :construction: Implemented logic for getting specializations and doctors by specializations

* :recycle: Refactored Specialization class

* :lipstick: Implemented frontend form for searching appointments

* :recycle: Clean code improvement

* :construction: Appointments scheduling

* :recycle: Test refactor

* :construction: Implemented frontend logic for scheduling appointments

* :recycle: Clen code improvement

* :recycle: Clean code improvement

* :white_check_mark: Tests for scheduling an appointment

* :sparkle: Scheduling an appointment

* :recycle: Test refactor

* :white_check_mark: Tests for appointment recommendations

* :construction: Appointment recommendation backend

* :construction: Appointment recommendation frontend

* :bug: Fixed bug in scheduling appointments

* :fire: deleted Migration files

* :recycle: Deleting unnecessary code

* Feature web block malicious users (#63)

* :construction: Implemented logic for getting specializations and doctors by specializations

* :recycle: Refactored Specialization class

* :lipstick: Implemented frontend form for searching appointments

* :iphone: Designed frontend view for observing appointments

* :iphone: Designed frontend for blocking malicious users

* :recycle: Clean code improvement

* :construction: Appointments scheduling

* :recycle: Test refactor

* :construction: Implemented frontend logic for scheduling appointments

* :white_check_mark: Added unit test for appointment

* :construction: Refactoring and working on repository service and model for appointment

* :recycle: Clen code improvement

* :recycle: Clean code improvement

* :white_check_mark: Tests for scheduling an appointment

* :sparkle: Scheduling an appointment

* :recycle: Test refactor

* :white_check_mark: Updated AppointmentTest updated old and added one new test

* :sparkles: Added controller adapter and DTO for appointment

* :construction: Worked on model, service, repository and controller for appointment

* :white_check_mark: Added unit tests for blocking patient

* :construction: Implemented repository and service for blocking patients

* :heavy_check_mark: Implemented tests for blocking malicious patients

* :white_check_mark: Added new unit tests and integration test for Appointment

* :hammer: Added service to startup and worked on controller for appointment

* :iphone: Finished design for observing appointments, added service, model

* :sparkles: Finished implementing logic for blocking patients

* :white_check_mark: Added new tests for appointment

* :construction: worked on repository for appointment

* :construction: added new methods to service and controllre for appointment

* :iphone: designed cancel button and connected it to backend for observing appointments

* :construction: Moved method for blocking patient to patient service

Updated that method and tests

* :white_check_mark: Added test for getting blockable patients

Also updated model and created adapters and DTOs

* :fire: Deleting FirstMigration

* :white_check_mark: Added integration test for canceling appointment

* :sparkles: Added CancelAppointmentDTO and cancelAppointment in frontend

* :construction: Added new appointments to database

* :iphone: Updated code for appointment service and component observe appointment

* :construction: Changed model for appointment and service and controller for appointment

* :question: I don't know

* :fire: clean code

* :twisted_rightwards_arrows: Merged develop into web-observe_appointments and fixed conficts

* :wrench: changed connectionPassword

* :heavy_check_mark: Implemented tests for getting blockable patients

* :construction: Added patient ID to appointment model builder

* :white_check_mark: Tests for appointment recommendations

* :construction: Appointment recommendation backend

* :construction: Appointment recommendation frontend

* :bug: Fixed bug in scheduling appointments

* :fire: deleted Migration files

* :heavy_check_mark: Added integration test for blocking patients and getting blocked patients

* :sparkles: Implemented controllers and services for getting blockable patients

Updated service for blocking malicious patients

* :bug: Fixed bug with intersect

* :lock: Fixed security issues because of duplicate password

Co-authored-by: Bojan <[email protected]>
Co-authored-by: Markovic Filip <[email protected]>
Co-authored-by: Aleksandar Ignjatijevic <[email protected]>

* Push notifications for medication usage reports (#65)

* :tada: Sending notification to pharmacy

* :sparkles: Implemented notification sending for usage reports

* :wrench: Fixed CORS configuration

* :pencil2: Fixed frontend typos

* :sparkles: Added drug specification acquisition

Co-authored-by: Kris98Wolf <[email protected]>

* :sparkles: Feature ia grpc client

* :sparkles: Added gRPC Client for Parmacy communication.

* :lipstick: check for medication status

* :bug: Fix gRPC Client message request

* :lipstick: medication availability check, simple gui changes

* :construction: Added PrescrioptionController to get all prescription

* :lipstick: show all prescription

* :lipstick: connecting front with prescription controller

* :construction: Generating prescription file for sharing

* :construction: Implemented sharing prescription with pharmacy with http

* :bug: Showing qr code.

* :bug: Fixed conflicts.

Co-authored-by: radovan-zupunski <[email protected]>

* :card_file_box: :bug: Fixed bug with envoienvoi variables and connection to database in PHIntegration.

* :docker: Added dockerfile for ph integration

* :lipstick: Redesigned frontend (#68)

* New feature ge appointment search by doctor and interval (#64)

* ::sparkles: Added appointment search by doctor, interval, equipment and by priority, implemented advanced search, implemented appointment schedule

* :lipstick: Fixed size of search button for appointment and binded datagrid to appointments in AdditonalInfromationForExaminationRoom

* :bug: Fixed bugs with appointment search by equipment

* :recycle: Refactoring AppointmentService

* :white_check_mark: added test for search by date and doctor

* :white_check_mark: Added test for appointment search by interval priority

* :white_check_mark::heavy_check_mark: Added test for priorty doctor search

* :hammer: Refactoring AppointmentFilterService and SearchAppointmentDTO

* :white_check_mark: Added test success test for appointment search by doctor priority

* :white_check_mark:  Added test for appointment search by equipment

* :heavy_check_mark: Making test AppointmentFilterService

* :lipstick: GUI change for appointment search

* :bug: Fixed bug with WebApplication not starting

* :hammer: Refactoring repositories

* :lipstick: :art: Optimising code using enum in GEWebService and improving estetics in GUI

Co-authored-by: @cyberpoetry <[email protected]>
Co-authored-by: Jovana Jakovljevic <[email protected]>
Co-authored-by: Aleksandar Ignjatijevic <[email protected]>

* :lipstick: Updated frontend for selenium end to end test (#72)

* :white_check_mark: :lipstick: Fixed tests in Ph integration and changes in text color on frontend

* :white_check_mark: Add test for check pharmacy permission to send notification

* :white_check_mark: Integration test for sending prescription.

* :white_check_mark: Added integration tests for usage report

* :bug: Fixed bugs in front and in GenerateMedicaionUsageReportTestIntegration.

Co-authored-by: radovan-zupunski <[email protected]>
Co-authored-by: Marko <[email protected]>
Co-authored-by: Stefan Aradjanin <[email protected]>

* :rocket: Web application ready for deployment.

* Set up CI with Azure Pipelines

[skip ci]

* Removed yaml file for CI pipeline

* :memo:Added Emoji recommendation to README

* :whale: Fixed dockerfile for web application

* :bug: Fixed bug with PostgreSQL database with DataSeeder objects

* :recycle: Refactored MySqlContext to MedbayTechDbContext and added dockerfile for web app production

* :whale: Dockerfile.Web added

* :bug: Fixed bug with migrations

* :bug: Fixed problem when migrations are not working

* :bug: :heavy_check_mark: Fixed problem with Selenium e2e

* :recycle: Refactored ph and graphic editor startup

* :sparkles: Connection to database established from startup

* :heavy_check_mark: Added profiling to testing enviornment

* :heavy_check_mark: Edited startup to pass CI pipeline

* :whale: Added all modified dockerfiles

* :hammer: Startups refactored

* :hammer: Started refactoring backend code

* :hamer: code refactoring

* :hammer: Code refactoring in tests

* :bug: :whale: Fixed bugs with Graphic Editor and added all dockerfiles

* :rocket: Front changed for deployment

* :rocket: Changed Cors options for deployment

* :rocket: Frontend fixed for deployment

* :rocket: WebAPI deployment ready.

* :hammer: Typo in frontend file

Co-authored-by: Aleksandar Ignjatijevic <[email protected]>
Co-authored-by: Stefan Aradjanin <[email protected]>
Co-authored-by: Danica <[email protected]>

* :heavy_check_mark: Fixed selenium endpoint

* :bug: :white_check_mark: Fixing selenium so it can work in production

* :heavy_check_mark: Selenium test fixed

Co-authored-by: OakenKnight <[email protected]>

* :ambulance: JsonProperty Ignore hotfix

* :ambulance: JsonProperty Ignore hotfix

* :card_file_box: Added more data to dataseeder.

Co-authored-by: Jelena Vlajkov <[email protected]>
Co-authored-by: OakenKnight <[email protected]>

* :construction: Updated context

* :bug: Fixed problems with vueclient in PharmacyIntegration

* :ambulance: Deployment hotfix for docker compose

* :whale: :bug: Fixed bug with dockefile, but compose still not working

* :whale: Trying to fix dockerfile for ph integration

* :whale: Dockerfile Monte Casino

* :whale: Operation Zitadelle executed

* :whale: Edited docker-compose file

* :lipstick: Changes to front

* :construction: Fixed front routing

* :whale: Fixed dockerfiles for integration tests

Co-authored-by: L4v <[email protected]>
Co-authored-by: OakenKnight <[email protected]>

* :whale: :bug: Fixed dockerfile for Ph Integration

* :recycle: Removed unused files

* :lipstick: Redesigned frontend to optimize for demo

* :pencil: Update readme (#80)

* :pencil: Updated readme.md file

* :hammer: Updated readme and refactored docker-compose

* :bug: Fixed bug with getting malicious patients (#82)

* :bug: Fixed bug with getting all malicious patients

* :bug: Fixed bug with getting malicious patients

* :fire: Removed unnecessary code

* :seedling: Added more doctor work days to data seeder

* IA vue deployment and fixed dockerfile (#83)

* :hammer: Separated vue front from ASP.NET back, automatic script removed

* :whale: Uncommented stuff in docker-override.yml

* :whale: Removed comment and tested docker-compose

Co-authored-by: L4v <[email protected]>

* :whale: Fixed docker compose for ph-integration

* :whale: Fixed dockercompose

* Running integration tests on azure with docker compose (#86)

* :whale: Fixed dockercompose

* :whale: Changing ports for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :rotating_light: Added smoketests to git

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :whale: Configuring compose for azure

* :poop: :grin: :whale: Running integration tests on azure pipeline

* :heavy_check_mark: Making appointment test pass

* :whale: Configuring compose for azure

Co-authored-by: jelena-vlajkov <[email protected]>

* :sparkles: Feature IA urgent medication procurement

* :sparkles: Created urgent procurement for medication.

* :lipstick: :construction: Created ui for urgent medication procurement

* :bug: fixed writing urgnet medication procurement to dababase

* :adhesive_bandage: Fixed Medication Controller to get all medication from database.

* :lipstick: :construction: updated ui for urgent medication procurement

* :bug: :lipstick: fixed ui for urgent medication procurement

* :white_check_mark: integration tests for urgent procurement requests

* :lipstick: update urgent order ui

* :lipstick: updated ui for urgent medication procurement

* :bug: Fixed problem with creating new medication.

* :white_check_mark: Removed test for sending urgent medication.

* :bug: Inherited MySqlRepository into repositories.

Co-authored-by: radovan-zupunski <[email protected]>

* Frontend for the patient homepage (#91)

* :iphone: Added navigation bar to frontend

* :lipstick: Redesigned navbar and added background picture

* :iphone: Started designing homepage

* :construction: Added content and footer to the homepage

* :iphone: Added temporary picture for ads

* :lipstick: Finished designing the home page for the patient

Co-authored-by: Markovic Filip <[email protected]>

* :iphone: Feature web patient login frontend (#92)

* :iphone: Designed form for patient login

* :seedling: Added system administrator to data seeder

* :white_check_mark: Added tests for patient and admin login

* :fire: Removed files for system administrator

* :fire: Removed login unit test

* :sparkles: Added microservices

* :construction: Added microservices

* :construction: Updated microservices

* :constuction: Created value objects in users micro service

* :construction: Users microservice

* :construction: Added value objects for user microservice

* :construction: Added Application, Controller, Infrastructure and Exceptions for MedbayTech.Appointment

* :construction: Patient service

* :construction: Fixed borked project reference

* :construction: Tried to add migrations to repository of patient documents microservice

* :construction: User microservice

* :construction: Changed DbContext

* :hammer: Rooms microservice partly implemented

* :hammer: Rooms microservice implemented partly

* :construction: User microservice refactor

* :construction: :hammer: Replaced Backend project

* :construction: Implemented block malicious user

* :construction: Added seeders for Patient Documets

* :construction: Implemented medical record controller

* :construction: Started examination and prescription repository

* :construction: Started implementing report service and repository

* :construction: Added configurations for reports

* :construction: Implemented prescription service and repository

* :construction: Implemented Patient Document microservice

* :construction: Implemented Appointment service

* :construction: Implementing rooms microservice

* :hammer: Doctor repository refactored

* :construction: Added doctor controller

* :construction: Implementing gateway for room microservice

* :construction: Finished appointment service and controller

* :construction: Fixed ocelot in API gateways

* :construction: Fixed configurations for room microservice

* :construction: Replaced frontend project

* :wrench: Fixed environments

* :construction: Added mappers for doctors

* :construction: Fixed namespace for User microservice

* :construction: Implementing controllers for room and appointment microservices

* :construction: Added mail service into users microservice

* :construction: Implemented patient registration microservice

* :construction: Changed ports in graphic editor controllers

* :construction: Survey microservice refactor

* :construction: Added configurations for survey Tabel

* :construction: Added survey repository and service

* :construction: Implementing appointment filter and appointment controller in appointment microservice

* :sparkles: Finished appointment and patient document microservice

* :construction: Trying to implement appointment filter controller

* :construction: Made searching appointments to work in filter appointment service

* :construction: Deleted reference to Backend project in Graphic Editor

* :lipstick: Renamed all projects

* :construction: Implemented authentication and admin authorization

* :construction: Added migration execution for dockerfiles

* :construction: Fixed project references

* :construction: Fixed project references again

* :construction: Fixed appointmentfilter service and show on map button for graphic editor wpf

* :construction: Added microservice for pharmacies

* :construction: Tried to implement schedule examination for graphic editor

* :construction: Connected login backend and frontend

* :construction: Implemented frontend logic for authentication and authorization

* :construction: Fixed login

* :bug: Fixed bug with scheduling appointment for graphic editor

* :white_check_mark: Started copying tests

* :white_check_mark: Copied tests to new project

* :construction: Started refactoring Scheduling tests

* :white_check_mark: Copied appointment search tests to new project

* :whale: Added dockerfiles for microservices and started fixing project for dockercompose

* :sparkles: Implemented medication microservice

* :construction: Added new ports for medication microservice

* :white_check_mark: Refactored scheduling tests

* :white_check_mark: Deleted test project

* :construction: Improved design for doctor column in wpf

* :white_check_mark: Started refactoring integration tests

* :sparkles: Finished implementing login

* :iphone: Added registration route in login component

* :construction: Added role to patient registration

* :bug: Trying to fix feedback data note seeded

* :heavy_check_mark: Implemented patient blocking end to end test

* :hammer: appointment microservice refactoring

* :construction: Fixed namespaces for graphic editor wpf

* :construction: Added graphic editor new functionalities

* :sparkles: Added graphic editor equipment realocation functionality

* :whale: Added dockerfile for pharmacies

* :construction: Added workdays for doctor

* :construction: Implemented guest patient registration

* :construction: Fixed emergency appointment and added workdays

* :construction: Fixed namespaces and dependecies

Co-authored-by: Bojan <[email protected]>
Co-authored-by: jelena-vlajkov <[email protected]>
Co-authored-by: Danica Vojvodic <[email protected]>
Co-authored-by: Markovic Filip <[email protected]>
Co-authored-by: ognjen98 <[email protected]>
Co-authored-by: OakenKnight <[email protected]>

* :bug: bugfix-sonar Removed ex in catch block

* :sparkles: Feature web ready for pull request (#96)

* :construction: Added microservices

* :construction: Updated microservices

* :constuction: Created value objects in users micro service

* :construction: Users microservice

* :construction: Added value objects for user microservice

* :construction: Added Application, Controller, Infrastructure and Exceptions for MedbayTech.Appointment

* :construction: Patient service

* :construction: Fixed borked project reference

* :construction: Tried to add migrations to repository of patient documents microservice

* :construction: User microservice

* :construction: Changed DbContext

* :hammer: Rooms microservice partly implemented

* :hammer: Rooms microservice implemented partly

* :construction: User microservice refactor

* :construction: :hammer: Replaced Backend project

* :construction: Implemented block malicious user

* :construction: Added seeders for Patient Documets

* :construction: Implemented medical record controller

* :construction: Started examination and prescription repository

* :construction: Started implementing report service and repository

* :construction: Added configurations for reports

* :construction: Implemented prescription service and repository

* :construction: Implemented Patient Document microservice

* :construction: Implemented Appointment service

* :construction: Implementing rooms microservice

* :hammer: Doctor repository refactored

* :construction: Added doctor controller

* :construction: Implementing gateway for room microservice

* :construction: Finished appointment service and controller

* :construction: Fixed ocelot in API gateways

* :construction: Fixed configurations for room microservice

* :construction: Replaced frontend project

* :wrench: Fixed environments

* :construction: Added mappers for doctors

* :construction: Fixed namespace for User microservice

* :construction: Implementing controllers for room and appointment microservices

* :construction: Added mail service into users microservice

* :construction: Implemented patient registration microservice

* :construction: Changed ports in graphic editor controllers

* :construction: Survey microservice refactor

* :construction: Added configurations for survey Tabel

* :construction: Added survey repository and service

* :construction: Implementing appointment filter and appointment controller in appointment microservice

* :sparkles: Finished appointment and patient document microservice

* :construction: Trying to implement appointment filter controller

* :construction: Made searching appointments to work in filter appointment service

* :construction: Deleted reference to Backend project in Graphic Editor

* :lipstick: Renamed all projects

* :construction: Implemented authentication and admin authorization

* :construction: Added migration execution for dockerfiles

* :construction: Fixed project references

* :construction: Fixed project references again

* :construction: Fixed appointmentfilter service and show on map button for graphic editor wpf

* :construction: Added microservice for pharmacies

* :construction: Tried to implement schedule examination for graphic editor

* :construction: Connected login backend and frontend

* :construction: Implemented frontend logic for authentication and authorization

* :construction: Fixed login

* :bug: Fixed bug with scheduling appointment for graphic editor

* :lipstick: Added navbar for admin, patient and user.  Added background image.

* :lipstick: Centered observe appointment and medical record and installed caruosel for home page

* :lipstick: Added buttons for going from medical record to search pages and apppointment page, and a button for switching to a appointment recommendation

* :white_check_mark: Started copying tests

* :white_check_mark: Copied tests to new project

* :construction: Started refactoring Scheduling tests

* :white_check_mark: Copied appointment search tests to new project

* :whale: Added dockerfiles for microservices and started fixing project for dockercompose

* :sparkles: Implemented medication microservice

* :construction: Added new ports for medication microservice

* :white_check_mark: Refactored scheduling tests

* :white_check_mark: Deleted test project

* :construction: Improved design for doctor column in wpf

* :white_check_mark: Started refactoring integration tests

* :sparkles: Finished implementing login

* :iphone: Added registration route in login component

* :construction: Added role to patient registration

* :bug: Trying to fix feedback data note seeded

* :heavy_check_mark: Implemented patient blocking end to end test

* :hammer: appointment microservice refactoring

* :lipstick: Updated navbar for all types of users, changed background colour, updated login frontend

* :lipstick: Centered welcome message

* :construction: Fixed namespaces for graphic editor wpf

* :construction: Added graphic editor new functionalities

* :sparkles: Added graphic editor equipment realocation functionality

* :lipstick: Changing frontend so e2e test for canceling appointment could work

* :heavy_check_mark: Implemented end to end test for canceling appointment

* :heavy_check_mark: Implemented login unit and integration tests

* :whale: Added dockerfile for pharmacies

* :heavy_check_mark: Fixed patient blocking e2e test

* :construction: Prevented blocked patients from logging in

* :lipstick: Added pharmacy ads in an image slider

* :construction: Added workdays for doctor

* :white_check_mark: Implemented Post Feedback E2E test

* :construction: Implemented guest patient registration

* :construction: Fixed emergency appointment and added workdays

* :construction: Fixed namespaces and dependecies

* :construction: Patient registration microservice

* :construction: Returned deleted routing module

* :construction: Added app-routing and fixed test

* :construction: Fixed test

* :construction: Updated URI of e2e tests

* :twisted_rightwards_arrows: Merged with develop

Co-authored-by: Bojan <[email protected]>
Co-authored-by: st3fan7 <[email protected]>
Co-authored-by: jelena-vlajkov <[email protected]>
Co-authored-by: Danica Vojvodic <[email protected]>
Co-authored-by: Markovic Filip <[email protected]>
Co-authored-by: Mihailo Ivić <[email protected]>
Co-authored-by: OakenKnight <[email protected]>

* :sparkles: Implemented feature event store

* :construction: Added microservices

* :construction: Updated microservices

* :constuction: Created value objects in users micro service

* :construction: Users microservice

* :construction: Added value objects for user microservice

* :construction: Added Application, Controller, Infrastructure and Exceptions for MedbayTech.Appointment

* :construction: Patient service

* :construction: Fixed borked project reference

* :construction: Tried to add migrations to repository of patient documents microservice

* :construction: User microservice

* :construction: Changed DbContext

* :hammer: Rooms microservice partly implemented

* :hammer: Rooms microservice implemented partly

* :construction: User microservice refactor

* :construction: :hammer: Replaced Backend project

* :construction: Implemented block malicious user

* :construction: Added seeders for Patient Documets

* :construction: Implemented medical record controller

* :construction: Started examination and prescription repository

* :construction: Started implementing report service and repository

* :construction: Added configurations for reports

* :construction: Implemented prescription service and repository

* :construction: Implemented Patient Document microservice

* :construction: Implemented Appointment service

* :construction: Implementing rooms microservice

* :hammer: Doctor repository refactored

* :construction: Added doctor controller

* :construction: Implementing gateway for room microservice

* :construction: Finished appointment service and controller

* :construction: Fixed ocelot in API gateways

* :construction: Fixed configurations for room microservice

* :construction: Replaced frontend project

* :wrench: Fixed environments

* :construction: Added mappers for doctors

* :construction: Fixed namespace for User microservice

* :construction: Implementing controllers for room and appointment microservices

* :construction: Added mail service into users microservice

* :construction: Implemented patient registration microservice

* :construction: Changed ports in graphic editor controllers

* :sparkles: Implemented repository for feedback evet

* :construction: Added Appointment events

* :fire: Deleted unnecessary project

Co-authored-by: Bojan <[email protected]>
Co-authored-by: st3fan7 <[email protected]>
Co-authored-by: Danica Vojvodic <[email protected]>

* :sparkles: :whale: :rocket: :boom: "That tear, good girl, is worth, ten thousand words" - The Trust: A Comedy, in Five Acts, 1808 (#98)

* :construction: Added microservices

* :construction: Updated microservices

* :constuction: Created value objects in users micro service

* :construction: Users microservice

* :construction: Added value objects for user microservice

* :construction: Added Application, Controller, Infrastructure and Exceptions for MedbayTech.Appointment

* :construction: Patient service

* :construction: Fixed borked project reference

* :construction: Tried to add migrations to repository of patient documents microservice

* :construction: User microservice

* :construction: Changed DbContext

* :hammer: Rooms microservice partly implemented

* :hammer: Rooms microservice implemented partly

* :construction: User microservice refactor

* :construction: :hammer: Replaced Backend project

* :construction: Implemented block malicious user

* :construction: Added seeders for Patient Documets

* :construction: Implemented medical record controller

* :construction: Started examination and prescription repository

* :construction: Started implementing report service and repository

* :construction: Added configurations for reports

* :construction: Implemented prescription service and repository

* :construction: Implemented Patient Document microservice

* :construction: Implemented Appointment service

* :construction: Implementing rooms microservice

* :hammer: Doctor repository refactored

* :construction: Added doctor controller

* :construction: Implementing gateway for room microservice

* :construction: Finished appointment service and controller

* :construction: Fixed ocelot in API gateways

* :construction: Fixed configurations for room microservice

* :construction: Replaced frontend project

* :wrench: Fixed environments

* :construction: Added mappers for doctors

* :construction: Fixed namespace for User microservice

* :construction: Implementing controllers for room and appointment microservices

* :construction: Added mail service into users microservice

* :construction: Implemented patient registration microservice

* :construction: Changed ports in graphic editor controllers

* :construction: Survey microservice refactor

* :construction: Added configurations for survey Tabel

* :construction: Added survey repository and service

* :construction: Implementing appointment filter and appointment controller in appointment microservice

* :sparkles: Finished appointment and patient document microservice

* :construction: Trying to implement appointment filter controller

* :construction: Made searching appointments to work in filter appointment service

* :construction: Deleted reference to Backend project in Graphic Editor

* :lipstick: Renamed all projects

* :construction: Implemented authentication and admin authorization

* :construction: Added migration execution for dockerfiles

* :construction: Fixed project references

* :construction: Fixed project references again

* :construction: Fixed appointmentfilter service and show on map button for graphic editor wpf

* :construction: Added microservice for pharmacies

* :construction: Tried to implement schedule examination for graphic editor

* :construction: Connected login backend and frontend

* :construction: Implemented frontend logic for authentication and authorization

* :construction: Fixed login

* :bug: Fixed bug with scheduling appointment for graphic editor

* :lipstick: Added navbar for admin, patient and user.  Added background image.

* :lipstick: Centered observe appointment and medical record and installed caruosel for home page

* :lipstick: Added buttons for going from medical record to search pages and apppointment page, and a button for switching to a appointment recommendation

* :white_check_mark: Started copying tests

* :white_check_mark: Copied tests to new project

* :construction: Started refactoring Scheduling tests

* :white_check_mark: Copied appointment search tests to new project

* :whale: Added dockerfiles for microservices and started fixing project for dockercompose

* :sparkles: Implemented medication microservice

* :construction: Added new ports for medication microservice

* :white_check_mark: Refactored scheduling tests

* :white_check_mark: Deleted test project

* :construction: Improved design for doctor column in wpf

* :white_check_mark: Started refactoring integration tests

* :sparkles: Finished implementing login

* :iphone: Added registration route in login component

* :construction: Added role to patient registration

* :bug: Trying to fix feedback data note seeded

* :heavy_check_mark: Implemented patient blocking end to end test

* :hammer: appointment microservice refactoring

* :lipstick: Updated navbar for all types of users, changed background colour, updated login frontend

* :lipstick: Centered welcome message

* :construction: Fixed namespaces for graphic editor wpf

* :whale: Made docker compose file for microservices

* :whale: Started docker containers with new frontend

* :lipstick: Changing frontend so e2e test for canceling appointment could work

* :heavy_check_mark: Implemented end to end test for canceling appointment

* :heavy_check_mark: Implemented login unit and integration tests

* :whale: Added fixed dockerfile for pharmacies

* :heavy_check_mark: Fixed patient blocking e2e test

* :construction: Prevented blocked patients from logging in

* :whale: Fixed dockerfile for pharmacies

* :lipstick: Added pharmacy ads in an image slider

* :whale: Added integration adapters in docker-compose

* :white_check_mark: Implemented Post Feedback E2E test

* :white_check_mark: Fixed selenium e2e feedback test for local deploy

* :white_check_mark: Fixed Test for blocking malicious patients for dockercompose

* :whale: Added migrations for feedback dockerfile

* :whale: Added pharmacies to dockercompose

* :bug: Trying to fix problem with data seed in pharmacies

* :white_check_mark: Integration tests returned to previous projects

* :whale: Fixed dockefiles for web and ph integration tests

* :whale: Fixed dockercompose

* :hammer: Fixing e2e tests for cd and local exec

* :hammer: Adding env variable for e2e test on cd pipeline

* :rocket: Added ocelot file for heroku deployment

* :bug: Changed wwwroot condition

* :twisted_rightwards_arrows: Merged with develop God help us

Co-authored-by: Bojan <[email protected]>
Co-authored-by: st3fan7 <[email protected]>
Co-authored-by: jelena-vlajkov <[email protected]>
Co-authored-by: Danica Vojvodic <[email protected]>
Co-authored-by: Markovic Filip <[email protected]>
Co-authored-by: ognjen98 <[email protected]>
Co-authored-by: Mihailo Ivić <[email protected]>

* :ambulance: Fixed heroku data seeding

* :ambulance: Trying to fix data seeding on heroku database

* :bug: Remove duplicated content

* :white_check_mark: Making publish feedback test pass

Co-authored-by: Aleksandar Ignjatijevic <[email protected]>

* :bug: :whale: :sparkles: Fixed problem when containerizing pharmacies and started working on tenders (#101)

* :recycle: :ambulance: :boom: Adjustment to microservices.

* :lipstick: Active tenders ui

* :bug: Added white space.

* :bug: :whale: Fixed env variables in prescription gateway in pharmacies project

Co-authored-by: radovan-zupunski <[email protected]>
Co-authored-by: OakenKnight <[email protected]>

* Feature ia tendering new (#102)

* :recycle: :ambulance: :boom: Adjustment to microservices.

* :lipstick: Active tenders ui

* :construction: Changed the tender model and added new methods in tender controller.

* :recycle: Small changes to tender UI and tender controllers.

* :white_check_mark: Add new tests

* :lipstick: Implemented rss feed.

* :recycle: Fixed Pharamacies configuration in project.

* :fire: :bug: Fixed confilcts and removed TenderMedicationOffer

* :recycle: Refactor code for Tenders.

* :bug: Fixed problem with tender tests.

Co-authored-by: radovan-zupunski <[email protected]>

* Feature web landing page (#103)

* :lipstick: Designed a landing page

* :construction: Fixed user navbar

* Refactored Medication out of Pharmacies ms (#104)

* :wrench:Fully removed Medications from Pharmacies ms

* :poop:Fixed test and build errors

* :fire: Removed redundant/useless Medication code from MedbayTech.Pharmacies. PH front now references MedbayTech.Medications. Fixed small typos.

* Repository for Medications MS and migration script (#105)

* :wrench:Fully removed Medications from Pharmacies ms

* :poop:Fixed test and build errors

* :fire: Removed redundant/useless Medication code from MedbayTech.Pharmacies. PH front now references MedbayTech.Medications. Fixed small typos.

* :recycle: Moved MedicationCategory and MedicationIngredient to ValueObjects

* :sparkles: Created MedbayTech.PharmacyUI

* :recycle: MedbayTech.Medication microservices no longer use in memory repositories

* :bug: Fixed improper seeding in Medication MS

* :hammer: Added migration powershell script

* :hammer: Added Test-Path and Howto to migration script

* :sparkles: Feature web observe prescriptions (#106)

* :iphone: Started designing frontend for observing prescriptions

* :bug: Fixed seeding symptoms and diagnosis

* :construction: Worked on getting reports for appointments

* :white_check_mark: Added unit and integration tests for getting report for appointment

* :construction: Implemented frontend and backend for getting report for appointment

* :sparkles: Implemented observe prescriptions for appointment

Co-authored-by: jelena-vlajkov <[email protected]>
Co-authored-by: Markovic Filip <[email protected]>

* :sparkles: Changes to feature observe prescriptions (#108)

* :iphone: Started designing frontend for observing prescriptions

* :bug: Fixed seeding symptoms and diagnosis

* :construction: Worked on getting reports for appointments

* :white_check_mark: Added unit and integration tests for getting report for appointment

* :construction: Implemented frontend and backend for getting report for appointment

* :sparkles: Implemented observe prescriptions for appointment

* :construction: Improved PDF creation

* :white_check_mark: Changed unit test for getting blockable patients

Co-authored-by: jelena-vlajkov <[email protected]>
Co-authored-by: Markovic Filip <[email protected]>

* :sparkles: Finished implementing observe reports for appointments (#110)

* Feature ia mailing (#112)

* :tada: Implemented sending mails to pharmacy

* :zap: Added mailing

* :lipstick: Finished sending mails to pharmacy

* :whale: Hotfix ia docker (#113)

* :tada: Implemented sending mails to pharmacy

* :zap: Added mailing

* :lipstick: Finished sending mails to pharmacy

* :whale: Dockerfile for pharmacies fixed

Co-authored-by: Kris98Wolf <[email protected]>

* :whale: Updated docker compose

* Feature web event sourcing (#111)

* :construction: Event sourcing backend and frontend

* :construction: Event sourcing

* :lipstick: Arranged front pages so there's no overlapping

* #construction Number of steps for successful scheduling and average steps

* :construction: Restart stepper after scheduling and fixed gender in med record

* :construction: Table clears content after scheduling

* :construction: Average number of steps for successcul shceduling

* :heavy_check_mark: Implemented tests for appointment events

* :sparkles: Implemented event sourcing for appointment

* :construction: Added paths to ocelot and environment

* :bug: Fixed bug with dividing integers

Changed type to double

* :whale: Updated docker compose

* :whale: :twisted_rightwards_arrows: Updated docker compose and merged with new develop

Co-authored-by: Bojan <[email protected]>
Co-authored-by: Mihailo Ivić <[email protected]>
Co-authored-by: jelena-vlajkov <[email protected]>

* :whale: Staging web app frontend for local deployment (#114)

* :whale: Updated docker compose

* :construction: :whale: Added enviornment variables to angular frontend

* :whale: Edited path to image in docker compose

* Feature ge renovation (#109)

* :lipstick: Added option in GUI for canceling all types of appointments

* :sparkles: Implemented option for scheduling basic renovation

* :lipstick: Added some MessageBox for additional information when somethnig is successful

* :sparkles: Implemented shortcuts for most visited objects and inventories

* :sparkles: Implemented complex renovation

* :lipstick: Fixed some bug in GUI for canceling appointments

* :hammer: Code refactoring for clean code

Co-authored-by: Jovana Jakovljevic <[email protected]>
Co-authored-by: @cyberpoetry <[email protected]>
Co-authored-by: NemanjaTam <[email protected]>

* Bugfix tests (#115)

* :rotating_light: Env variables in tests

* :rotating_light: Env variables in tests

* :rotating_light: Env variables in tests

* :bug: Added new dates for appointment

* :bug: Route

* :bug: Route

* :bug: Route

* :bug: Added malicious patient

* :sparkles:  Added microservice for tenders (#116)

* :sparkles: Created Tender microservice

* :hammer: Fixed Integration tests with gateways

* :hammer: Fixed CORS for tenders

* :white_check_mark: Fixed Pharmacy Integration tests

* :bug: Removed hardcoded paths from RssController.

* :bug: :zap: :hammer: Removing unnecessary entities and services (#119)

* :bug: Bugfix ge appointments (#120)

* :bug: Fixing bugs in appointments

* :bug: Fixing bugs in AppointmentService

Co-authored-by: Jelena Vlajkov <[email protected]>

* :lipstick: Frontend changes for the demo (#121)

* :lipstick: changed lorem ipsum text to an actual text on landing page and home p…
  • Loading branch information
25 people authored Jan 30, 2021
1 parent c45e560 commit f57b62c
Show file tree
Hide file tree
Showing 2,131 changed files with 1,449,777 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**/dist
**/node_modules
14 changes: 13 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,16 @@ msbuild.err
msbuild.wrn

# Visual Studio 2015
.vs/
.vs/

# Pharmacy Integration
GeneratedPrescription/
GeneratedUsageReports/
DrugSpecifications/
node_modules/

#Backend
Migrations/

# Migration script
microservices.txt
34 changes: 34 additions & 0 deletions Dockerfile.APIGateway
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
FROM node:12.2.0 as builder

WORKDIR /app
COPY WebApplicationFrontend/ .
ENV PATH /app/node_modules/.bin:$PATH

COPY WebApplicationFrontend/package.json .
RUN npm install
RUN npm install -g @angular/[email protected]

RUN ng build --prod --base-href=/

FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
WORKDIR /app

COPY MedbayTech.APIGateways/MedbayTech.APIGateways.csproj MedbayTech.APIGateways/
RUN dotnet restore MedbayTech.APIGateways/MedbayTech.APIGateways.csproj

COPY . .

FROM build AS publish
WORKDIR /app
ENV API_URL $API_URL
COPY --from=builder app/dist/WebApplicationFrontend/ MedbayTech.APIGateways/wwwroot/dist/
CMD sh -c envsubst < MedbayTech.APIGateways/wwwroot/dist/assets/env.template.js > MedbayTech.APIGateways/wwwroot/dist/assets/env.js && exec nginx -g 'daemon off;'
RUN dotnet publish MedbayTech.APIGateways/MedbayTech.APIGateways.csproj -c Release -o out

FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS runtime
RUN useradd -ms /bin/bash defaultuser
WORKDIR /app
COPY --from=publish /app/out .
EXPOSE 5000

CMD ASPNETCORE_URLS=http://*:$PORT dotnet MedbayTech.APIGateways.dll
32 changes: 32 additions & 0 deletions Dockerfile.APITest
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
FROM node:12.2.0 as builder

WORKDIR /app
COPY WebApplicationFrontend/ .
ENV PATH /app/node_modules/.bin:$PATH

COPY WebApplicationFrontend/package.json .
RUN npm install
RUN npm install -g @angular/[email protected]

RUN ng build --base-href=/ --configuration=test

FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
WORKDIR /app

COPY MedbayTech.APIGateways/MedbayTech.APIGateways.csproj MedbayTech.APIGateways/
RUN dotnet restore MedbayTech.APIGateways/MedbayTech.APIGateways.csproj

COPY . .

FROM build AS publish
WORKDIR /app
COPY --from=builder app/dist/WebApplicationFrontend/ MedbayTech.APIGateways/wwwroot/dist/
RUN dotnet publish MedbayTech.APIGateways/MedbayTech.APIGateways.csproj -c Release -o out

FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS runtime
RUN useradd -ms /bin/bash defaultuser
WORKDIR /app
COPY --from=publish /app/out .
EXPOSE 5000
ENV API_URL $API_URL
CMD ASPNETCORE_URLS=http://*:$PORT dotnet MedbayTech.APIGateways.dll
29 changes: 29 additions & 0 deletions Dockerfile.Appointment
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build

WORKDIR /app

COPY MedbayTech.Common/MedbayTech.Common.csproj MedbayTech.Common/
COPY MedbayTech.Appointment/MedbayTech.Appointment.csproj MedbayTech.Appointment/

RUN dotnet restore MedbayTech.Appointment/MedbayTech.Appointment.csproj

COPY . .

FROM build AS publish
WORKDIR /app/MedbayTech.Appointment

ENV PATH $PATH:/root/.dotnet/tools
RUN dotnet tool install -g dotnet-ef --version 3.1.9
RUN dotnet ef migrations add Init

WORKDIR /app
RUN dotnet publish MedbayTech.Appointment/MedbayTech.Appointment.csproj -c Release -o out

FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS runtime

RUN useradd -ms /bin/bash defaultuser
WORKDIR /app

COPY --from=publish /app/out .
EXPOSE 5008
CMD ASPNETCORE_URLS=http://*:$PORT dotnet MedbayTech.Appointment.dll
29 changes: 29 additions & 0 deletions Dockerfile.Feedback
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build

WORKDIR /app

COPY MedbayTech.Common/MedbayTech.Common.csproj MedbayTech.Common/
COPY MedbayTech.Feedback/MedbayTech.Feedback.csproj MedbayTech.Feedback/

RUN dotnet restore MedbayTech.Feedback/MedbayTech.Feedback.csproj

COPY . .

FROM build AS publish
WORKDIR /app/MedbayTech.Feedback

ENV PATH $PATH:/root/.dotnet/tools
RUN dotnet tool install -g dotnet-ef --version 3.1.9
RUN dotnet ef migrations add Init

WORKDIR /app
RUN dotnet publish MedbayTech.Feedback/MedbayTech.Feedback.csproj -c Release -o out

FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS runtime

RUN useradd -ms /bin/bash defaultuser
WORKDIR /app

COPY --from=publish /app/out .
EXPOSE 5003
CMD ASPNETCORE_URLS=http://*:$PORT dotnet MedbayTech.Feedback.dll
30 changes: 30 additions & 0 deletions Dockerfile.GraphicEditor
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
WORKDIR /app

COPY Backend/Backend.csproj Backend/
COPY GraphicEditorWebService/GraphicEditorWebService.csproj GraphicEditorWebService/


RUN dotnet restore GraphicEditorWebService/GraphicEditorWebService.csproj

COPY . .

FROM build AS publish
WORKDIR /app/Backend

ENV PATH $PATH:/root/.dotnet/tools
RUN dotnet tool install -g dotnet-ef --version 3.1.9
RUN dotnet ef migrations add Init

WORKDIR /app
RUN dotnet publish GraphicEditorWebService/GraphicEditorWebService.csproj -c Release -o out

FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS runtime

RUN useradd -ms /bin/bash defaultuser
WORKDIR /app

COPY --from=publish /app/out .

CMD ASPNETCORE_URLS=http://*:$PORT dotnet GraphicEditorWebService.dll

30 changes: 30 additions & 0 deletions Dockerfile.Medications
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build

WORKDIR /app

COPY MedbayTech.Common/MedbayTech.Common.csproj MedbayTech.Common/
COPY MedbayTech.Medications/MedbayTech.Medications.csproj MedbayTech.Medications/

RUN dotnet restore MedbayTech.Medications/MedbayTech.Medications.csproj

COPY . .

FROM build AS publish
WORKDIR /app/MedbayTech.Medications

ENV PATH $PATH:/root/.dotnet/tools
RUN dotnet tool install -g dotnet-ef --version 3.1.9
RUN dotnet ef migrations add Init

WORKDIR /app
RUN dotnet publish MedbayTech.Medications/MedbayTech.Medications.csproj -c Release -o out

FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS runtime

RUN useradd -ms /bin/bash defaultuser
WORKDIR /app

COPY --from=publish /app/out .
EXPOSE 5007

CMD ASPNETCORE_URLS=http://*:$PORT dotnet MedbayTech.Medications.dll
29 changes: 29 additions & 0 deletions Dockerfile.PatientDocuments
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build

WORKDIR /app

COPY MedbayTech.Common/MedbayTech.Common.csproj MedbayTech.Common/
COPY MedbayTech.PatientDocuments/MedbayTech.PatientDocuments.csproj MedbayTech.PatientDocuments/

RUN dotnet restore MedbayTech.PatientDocuments/MedbayTech.PatientDocuments.csproj

COPY . .

FROM build AS publish
WORKDIR /app/MedbayTech.PatientDocuments

ENV PATH $PATH:/root/.dotnet/tools
RUN dotnet tool install -g dotnet-ef --version 3.1.9
RUN dotnet ef migrations add Init

WORKDIR /app
RUN dotnet publish MedbayTech.PatientDocuments/MedbayTech.PatientDocuments.csproj -c Release -o out

FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS runtime

RUN useradd -ms /bin/bash defaultuser
WORKDIR /app

COPY --from=publish /app/out .
EXPOSE 5006
CMD ASPNETCORE_URLS=http://*:$PORT dotnet MedbayTech.PatientDocuments.dll
72 changes: 72 additions & 0 deletions Dockerfile.PhIntegration
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# FROM mcr.microsoft.com/dotnet/core/sdk:3.1-alpine AS build

# RUN apk add --update nodejs nodejs-npm

# RUN mkdir /src
# WORKDIR /src

# COPY Backend/Backend.csproj Backend/Backend.csproj
# COPY PharmacyIntegration/PharmacyIntegration.csproj PharmacyIntegration/PharmacyIntegration.csproj

# RUN dotnet restore Backend/Backend.csproj
# RUN dotnet restore PharmacyIntegration/PharmacyIntegration.csproj

# COPY . ./

# RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub
# RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.32-r0/glibc-2.32-r0.apk
# RUN apk add glibc-2.32-r0.apk

# RUN dotnet publish /src/PharmacyIntegration/PharmacyIntegration.csproj -c Release

# FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-alpine
# WORKDIR /app
# COPY --from=build /src .
# COPY --from=build /src/PharmacyIntegration/vueclient /app/PharmacyIntegration/bin/Release/netcoreapp3.1/publish/vueclient
# RUN apk add --update nodejs nodejs-npm

# WORKDIR /app/PharmacyIntegration/bin/Release/netcoreapp3.1/publish/vueclient
# RUN npm install
# RUN npm install -g @vue/cli
# RUN npm install --save axios vue-axios
# RUN npm run build

# WORKDIR /app/PharmacyIntegration/bin/Release/netcoreapp3.1/publish
# EXPOSE 50202
# ENTRYPOINT [ "dotnet", "PharmacyIntegration.dll" ]

FROM mcr.microsoft.com/dotnet/core/sdk:3.1-alpine AS build

RUN apk add --update nodejs nodejs-npm

RUN mkdir /src
WORKDIR /src

COPY MedbayTech.Common/MedbayTech.Common.csproj MedbayTech.Common/
COPY MedbayTech.PharmacyIntegration/MedbayTech.PharmacyIntegration.csproj MedbayTech.PharmacyIntegration/MedbayTech.PharmacyIntegration.csproj

RUN dotnet restore MedbayTech.PharmacyIntegration/MedbayTech.PharmacyIntegration.csproj

COPY . ./

RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub
RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.32-r0/glibc-2.32-r0.apk
RUN apk add glibc-2.32-r0.apk

RUN dotnet publish /src/MedbayTech.PharmacyIntegration/MedbayTech.PharmacyIntegration.csproj -c Release

FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-alpine
WORKDIR /app
COPY --from=build /src .
COPY --from=build /src/MedbayTech.PharmacyIntegration/WebUI/vueclient /app/MedbayTech.harmacyIntegration/bin/Release/netcoreapp3.1/publish/WebUI/vueclient
RUN apk add --update nodejs nodejs-npm

WORKDIR /app/MedbayTech.PharmacyIntegration/bin/Release/netcoreapp3.1/publish/WebUI/vueclient
RUN npm install
RUN npm install -g @vue/cli
RUN npm install --save axios vue-axios
RUN npm run build

WORKDIR /app/MedbayTech.PharmacyIntegration/bin/Release/netcoreapp3.1/publish

ENTRYPOINT [ "dotnet", "MedbayTech.PharmacyIntegration.dll" ]
20 changes: 20 additions & 0 deletions Dockerfile.PhIntegrationTests
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
WORKDIR /app

COPY MedbayTech.Pharmacies/MedbayTech.Pharmacies.csproj MedbayTech.Pharmacies/
COPY MedbayTech.Tenders/MedbayTech.Tenders.csproj MedbayTech.Tenders/
COPY MedbayTech.Medications/MedbayTech.Medications.csproj MedbayTech.Medications/
COPY MedbayTech.PharmacyIntegrationTests/MedbayTech.PharmacyIntegrationTests.csproj MedbayTech.PharmacyIntegrationTests/
COPY MedbayTech.Common/MedbayTech.Common.csproj MedbayTech.Common/

RUN dotnet restore MedbayTech.PharmacyIntegrationTests/MedbayTech.PharmacyIntegrationTests.csproj

RUN apt-get update && apt-get install -y --allow-unauthenticated libc6-dev libgdiplus libx11-dev && rm -rf /var/lib/apt/lists/*

COPY . .

FROM build AS test
LABEL test=true

WORKDIR /app/MedbayTech.PharmacyIntegrationTests
CMD ["dotnet", "test"]
Loading

0 comments on commit f57b62c

Please sign in to comment.