Index: Farmatiko/ClientApp/package.json =================================================================== --- Farmatiko/ClientApp/package.json (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ Farmatiko/ClientApp/package.json (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -4,5 +4,5 @@ "scripts": { "ng": "ng", - "start": "ng serve -o", + "start": "ng serve", "build": "ng build", "build:ssr": "ng run Farmatiko:server:dev", Index: Farmatiko/ClientApp/src/app/counter/counter.component.html =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.html (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ Farmatiko/ClientApp/src/app/counter/counter.component.html (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -3,5 +3,5 @@ - +
@@ -16,25 +16,25 @@ {{facilities.name}} - + Општина {{facilities.municipality}} - + Адреса {{facilities.address}} - + Тип {{facilities.type}} - + Е-пошта {{facilities.email}} - + Телефон @@ -48,5 +48,5 @@
- +
@@ -56,37 +56,29 @@
- +
- + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - + + + + +
Име {{facilities.name}} {{workers.name}} Општина {{facilities.municipality}} Гранка {{workers.branch}} Адреса {{facilities.address}} Установа {{workers.facility}} Тип {{facilities.type}} Назив {{workers.title}} Е-пошта {{facilities.email}} Телефон {{facilities.phone}}
Index: Farmatiko/ClientApp/src/app/counter/counter.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -5,4 +5,5 @@ import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; +import { HealthcareWorkers } from '../models/HealthcareWorkers'; @Component({ @@ -13,6 +14,9 @@ export class CounterComponent implements OnInit { public facilities: HealthFacilities[]; + public workers: HealthcareWorkers[]; displayedColumns = ['Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон']; + displayedColumnsWorkers = ['Име','Гранка','Установа', 'Назив']; dataSource = new MatTableDataSource(); + dataSourceWorkers = new MatTableDataSource(); @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator; @@ -25,4 +29,9 @@ this.dataSource = new MatTableDataSource(this.facilities); }, error => console.error(error)); + http.get(baseUrl + 'HealthcareWorker/Get?').subscribe(result => { + this.workers = result; + console.log(this.workers); + this.dataSourceWorkers = new MatTableDataSource(this.workers); + }, error => console.error(error)); } ngOnInit(): void { @@ -32,4 +41,6 @@ this.dataSource.paginator = this.paginator; this.dataSource.sort = this.sort; + this.dataSourceWorkers.paginator = this.paginator; + this.dataSourceWorkers.sort = this.sort; } @@ -38,4 +49,5 @@ filterValue = filterValue.toLowerCase(); this.dataSource.filter = filterValue; + this.dataSourceWorkers.filter = filterValue; } } Index: Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -5,5 +5,5 @@ import { MatSort } from '@angular/material/sort'; import { HealthFacilities } from '../models/HealthFacilities'; -import { HttpClient } from '@angular/common/http';; +import { HttpClient } from '@angular/common/http'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar'; Index: Farmatiko/ClientApp/src/environments/environment.prod.ts =================================================================== --- Farmatiko/ClientApp/src/environments/environment.prod.ts (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ Farmatiko/ClientApp/src/environments/environment.prod.ts (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -1,3 +1,4 @@ export const environment = { - production: true + production: true, + baseApiUrl: 'htpps://api.farmatiko.com/', }; Index: Farmatiko/ClientApp/src/environments/environment.ts =================================================================== --- Farmatiko/ClientApp/src/environments/environment.ts (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ Farmatiko/ClientApp/src/environments/environment.ts (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -4,5 +4,6 @@ export const environment = { - production: false + production: false, + baseApiUrl: 'https://localhost:44342/', }; Index: Farmatiko/ClientApp/src/main.ts =================================================================== --- Farmatiko/ClientApp/src/main.ts (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ Farmatiko/ClientApp/src/main.ts (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -6,5 +6,5 @@ export function getBaseUrl() { - return document.getElementsByTagName('base')[0].href; + return environment.baseApiUrl; } Index: Farmatiko/ClientApp/tsconfig.json =================================================================== --- Farmatiko/ClientApp/tsconfig.json (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ Farmatiko/ClientApp/tsconfig.json (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -2,5 +2,5 @@ "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", + "baseUrl": "https://localhost:44342/", "module": "esnext", "outDir": "./dist/out-tsc", Index: Farmatiko/Controllers/HealthFacilitiesController.cs =================================================================== --- Farmatiko/Controllers/HealthFacilitiesController.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ Farmatiko/Controllers/HealthFacilitiesController.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -1,4 +1,5 @@ using FarmatikoData; using FarmatikoData.Models; +using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; @@ -20,20 +21,4 @@ return _healthFacilitiesService.GetAll(); } - [HttpGet] - public IEnumerable GetByName(string Name) - { - return _healthFacilitiesService.GetByName(Name); - } - - [HttpGet] - public IEnumerable GetByType(string Type) - { - return _healthFacilitiesService.GetByType(Type); - } - [HttpPut] - public void Add(HealthFacilities healthFacility) - { - _healthFacilitiesService.Add(healthFacility); - } } } Index: Farmatiko/Controllers/HealthcareWorkerController.cs =================================================================== --- Farmatiko/Controllers/HealthcareWorkerController.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ Farmatiko/Controllers/HealthcareWorkerController.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -1,9 +1,14 @@ -using Microsoft.AspNetCore.Mvc; -using FarmatikoData.FarmatikoServiceInterfaces; +using System; using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using FarmatikoData.Models; +using FarmatikoServices.FarmatikoServiceInterfaces; +using Microsoft.AspNetCore.Mvc; namespace Farmatiko.Controllers { + [ApiController] + [Route("[controller]/[action]")] public class HealthcareWorkerController : Controller { @@ -15,28 +20,9 @@ [HttpGet] - public IEnumerable GetAll() + public IEnumerable Get() { return _healthcareWorkerService.GetAll(); } - [HttpGet] - public HealthcareWorkers GetByName(string Name) - { - return _healthcareWorkerService.GetByName(Name); - } - [HttpGet] - public IEnumerable GetAllByBranch(string Branch) - { - return _healthcareWorkerService.GetAllByBranch(Branch); - } - [HttpGet] - public IEnumerable GetAllByFacility(HealthFacilities Facility) - { - return _healthcareWorkerService.GetAllByFacility(Facility); - } - [HttpGet] - public void Add(HealthcareWorkers HealthcareWorker) - { - _healthcareWorkerService.Add(HealthcareWorker); - } + } } Index: Farmatiko/Controllers/MedicineController.cs =================================================================== --- Farmatiko/Controllers/MedicineController.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) +++ Farmatiko/Controllers/MedicineController.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using FarmatikoData.Models; +using FarmatikoServices.FarmatikoServiceInterfaces; +using Microsoft.AspNetCore.Mvc; + +namespace Farmatiko.Controllers +{ + [ApiController] + [Route("[controller]/[action]")] + public class MedicineController : Controller + { + private IMedicineService _medicineService; + public MedicineController(IMedicineService medicineService) + { + _medicineService = medicineService; + } + [HttpGet] + public IEnumerable Get() + { + return _medicineService.GetAll(); + } + } +} Index: Farmatiko/Properties/launchSettings.json =================================================================== --- Farmatiko/Properties/launchSettings.json (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ Farmatiko/Properties/launchSettings.json (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -1,3 +1,3 @@ -{ +{ "iisSettings": { "windowsAuthentication": false, @@ -11,5 +11,4 @@ "IIS Express": { "commandName": "IISExpress", - "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" @@ -19,8 +18,8 @@ "commandName": "Project", "launchBrowser": true, - "applicationUrl": "https://localhost:5001;http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "applicationUrl": "https://localhost:5001;http://localhost:5000" } } Index: Farmatiko/Startup.cs =================================================================== --- Farmatiko/Startup.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ Farmatiko/Startup.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -11,4 +11,6 @@ using FarmatikoData.FarmatikoRepoInterfaces; using FarmatikoData.FarmatikoRepo; +using FarmatikoServices.FarmatikoServiceInterfaces; +using FarmatikoServices.Services; namespace Farmatiko @@ -16,4 +18,6 @@ public class Startup { + readonly string MyAllowSpecificOrigins = "_myAllowSpecificOrigins"; + public Startup(IConfiguration configuration) { @@ -26,4 +30,13 @@ public void ConfigureServices(IServiceCollection services) { + services.AddCors(options => + { + options.AddPolicy(name: MyAllowSpecificOrigins, + builder => + { + builder.AllowAnyHeader().AllowAnyMethod().AllowAnyOrigin(); + }); + }); + services.AddControllersWithViews(); // In production, the Angular files will be served from this directory @@ -37,4 +50,6 @@ services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } @@ -62,4 +77,6 @@ app.UseRouting(); + app.UseCors(MyAllowSpecificOrigins); + app.UseEndpoints(endpoints => { Index: FarmatikoData/Base/BaseEntity.cs =================================================================== --- FarmatikoData/Base/BaseEntity.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoData/Base/BaseEntity.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -2,4 +2,5 @@ using System.Collections.Generic; using System.Text; +using System.ComponentModel.DataAnnotations; namespace FarmatikoData.Base @@ -9,6 +10,5 @@ public int Id { get; set; } public DateTime CreatedOn { get; set; } - - public DateTime DeletedOn { get; set; } + public DateTime? DeletedOn { get; set; } } } Index: FarmatikoData/FarmatikoData.csproj =================================================================== --- FarmatikoData/FarmatikoData.csproj (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoData/FarmatikoData.csproj (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -4,4 +4,13 @@ netcoreapp3.1 + + + + + + + + + Index: FarmatikoData/FarmatikoDataContext.cs =================================================================== --- FarmatikoData/FarmatikoDataContext.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoData/FarmatikoDataContext.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -1,7 +1,4 @@ using FarmatikoData.Models; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Text; namespace FarmatikoData Index: FarmatikoData/FarmatikoRepo/HealthFacilityRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/HealthFacilityRepository.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoData/FarmatikoRepo/HealthFacilityRepository.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -29,16 +29,4 @@ } - public IEnumerable GetAllByName(string Name) - { - Name = Name.ToLower(); - - return _context.HealthFacilities.Where(x => x.Name.ToLower().Contains(Name)).OrderBy(x => x.Name.ToLower().IndexOf(Name)).ToList(); - } - - IEnumerable IHealthFacilityRepository.GetByType(string Type) - { - return (IEnumerable)_context.HealthFacilities - .Where(type => type.Type.Equals(Type)); - } } } Index: FarmatikoData/FarmatikoRepo/HealthcareWorkerRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/HealthcareWorkerRepository.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) +++ FarmatikoData/FarmatikoRepo/HealthcareWorkerRepository.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -0,0 +1,34 @@ +using FarmatikoData.FarmatikoRepoInterfaces; +using FarmatikoData.Models; +using System.Linq; +using System.Collections.Generic; + +namespace FarmatikoData.FarmatikoRepo +{ + public class HealthcareWorkerRepository : IHealthcareWorkerRepository + { + + private FarmatikoDataContext _context; + + public HealthcareWorkerRepository(FarmatikoDataContext context) + { + _context = context; + } + + public void Add(HealthcareWorkers HealthcareWorker) + { + _context.Add(HealthcareWorker); + _context.SaveChangesAsync(); + } + + public IEnumerable GetAll() + { + return _context.HealthcareWorkers.OrderBy(x => x.Name); + } + + public void Remove(HealthcareWorkers healthcareWorker) + { + _context.Remove(healthcareWorker); + } + } +} Index: rmatikoData/FarmatikoRepo/HealthcareWorkersRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/HealthcareWorkersRepository.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ (revision ) @@ -1,47 +1,0 @@ -using FarmatikoData.FarmatikoRepoInterfaces; -using FarmatikoData.Models; -using System; -using System.Linq; -using System.Collections.Generic; -using System.Text; -using Microsoft.EntityFrameworkCore; - -namespace FarmatikoData.FarmatikoRepo -{ - public class HealthcareWorkersRepository : IHealthcareWorkersRepository - { - - private FarmatikoDataContext _context; - - public HealthcareWorkersRepository(FarmatikoDataContext context) - { - _context = context; - } - - public void Add(HealthcareWorkers HealthcareWorker) - { - _context.Add(HealthcareWorker); - _context.SaveChangesAsync(); - } - - public IEnumerable GetAll() - { - return _context.HealthcareWorkers; - } - - public ICollection GetByBranch(string Branch) - { - return (ICollection)_context.HealthcareWorkers.Where(healthcareWorker => healthcareWorker.Branch == Branch); - } - - public ICollection GetByFacility(HealthFacilities HealthFacility) - { - return (ICollection)_context.HealthcareWorkers.Where(Facility => Facility.Facility.Equals(HealthFacility)); - } - - public HealthcareWorkers GetByName(string Name) - { - return (HealthcareWorkers)_context.HealthcareWorkers.Where(healthcareWorker => healthcareWorker.Name == Name); - } - } -} Index: FarmatikoData/FarmatikoRepo/MedicineListRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/MedicineListRepository.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoData/FarmatikoRepo/MedicineListRepository.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -20,19 +20,39 @@ _context.SaveChangesAsync(); } + // Maybe later + /*public MedicineList CheckMedicine(string Name) + { + return (MedicineList)_context.MedicineLists + .Where(medicineList => medicineList.Medicine.Name.Contains(Name)) + .OrderBy(x => x.Medicine.Name); + }*/ - public MedicineList CheckMedicine(string Name) + public ICollection GetAll() { - return (MedicineList)_context.MedicineLists.Where(medicineList => medicineList.Medicine.Name.Equals(Name)); + return (ICollection)_context.MedicineLists.OrderBy(x => x.Medicine.Name); } - public MedicineList GetAll() + public ICollection GetByManufacturer(string Manufacturer) { - return (MedicineList)_context.MedicineLists.Include(list => list.Medicine).Include(list => list.HasMedicine); + return (ICollection)_context.MedicineLists + .Where(x => x.Medicine.Manufacturer.Contains(Manufacturer)) + .OrderBy(x => x.Medicine.Name); + } + public ICollection GetByName(string Name) + { + return (ICollection)_context.MedicineLists + .Where(x => x.Medicine.Name.Contains(Name)) + .OrderBy(x => x.Medicine.Name); } public void Remove(MedicineList medicineList) { - //throw new NotImplementedException(); - //Implement later + var list = (MedicineList)_context.MedicineLists.Where(x => x.Equals(medicineList)); + _context.Remove(list); + } + + public void SetHasMedicine(MedicineList medicineList, bool HasMedicine) + { + var medicine = _context.MedicineLists.Where(x => x.Medicine.Equals(medicineList.Medicine)); } } Index: FarmatikoData/FarmatikoRepo/MedicineRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/MedicineRepository.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoData/FarmatikoRepo/MedicineRepository.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -27,7 +27,12 @@ } - public Medicine GetByName(string Name) + public IEnumerable GetByManufacturer(string Manufacturer) { - return (Medicine)_context.Medicines.Where(medicine => medicine.Name == Name); + return _context.Medicines.Where(x => x.Name.Contains(Manufacturer)).OrderBy(x => x.Manufacturer); + } + + public IEnumerable GetByName(string Name) + { + return (IEnumerable)_context.Medicines.Where(medicine => medicine.Name == Name); } @@ -35,5 +40,5 @@ { Medicine med = (Medicine)_context.Medicines.Where(medicine => medicine.Name.Equals(medicine)); - _context.Medicines.Remove(med); + _context.Remove(med); } } Index: FarmatikoData/FarmatikoRepoInterfaces/IHealthFacilityRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IHealthFacilityRepository.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoData/FarmatikoRepoInterfaces/IHealthFacilityRepository.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -9,7 +9,5 @@ { IEnumerable GetAll(); - IEnumerable GetByType(string Type); void Add(HealthFacilities healthFacility); - IEnumerable GetAllByName(string Name); } } Index: FarmatikoData/FarmatikoRepoInterfaces/IHealthcareWorkerRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IHealthcareWorkerRepository.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) +++ FarmatikoData/FarmatikoRepoInterfaces/IHealthcareWorkerRepository.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -0,0 +1,14 @@ +using FarmatikoData.Models; +using System; +using System.Collections.Generic; +using System.Text; + +namespace FarmatikoData.FarmatikoRepoInterfaces +{ + public interface IHealthcareWorkerRepository + { + IEnumerable GetAll(); + void Add(HealthcareWorkers HealthcareWorker); + void Remove(HealthcareWorkers healthcareWorker); + } +} Index: rmatikoData/FarmatikoRepoInterfaces/IHealthcareWorkersRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IHealthcareWorkersRepository.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ (revision ) @@ -1,17 +1,0 @@ -using FarmatikoData.Models; -using System; -using System.Collections.Generic; -using System.Text; - -namespace FarmatikoData.FarmatikoRepoInterfaces -{ - public interface IHealthcareWorkersRepository - { - IEnumerable GetAll(); - HealthcareWorkers GetByName(string Name); - ICollection GetByBranch(string Branch); - ICollection GetByFacility(HealthFacilities HealthFacility); - void Add(HealthcareWorkers HealthcareWorker); - - } -} Index: FarmatikoData/FarmatikoRepoInterfaces/IMedicineListRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IMedicineListRepository.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoData/FarmatikoRepoInterfaces/IMedicineListRepository.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -10,6 +10,11 @@ void Add(MedicineList medicineList); void Remove(MedicineList medicineList); - MedicineList GetAll(); - MedicineList CheckMedicine(string Name); + ICollection GetAll(); + //Not needed, maybe later + /*MedicineList CheckMedicine(MedicineList medicineList, bool HasMedicine); + public MedicineList CheckMedicine(string Name);*/ + ICollection GetByName(string Name); + ICollection GetByManufacturer(string Manufacturer); + void SetHasMedicine(MedicineList medicineList, bool HasMedicine); } } Index: FarmatikoData/FarmatikoRepoInterfaces/IMedicineRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IMedicineRepository.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoData/FarmatikoRepoInterfaces/IMedicineRepository.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -9,7 +9,8 @@ { IEnumerable GetAll(); - Medicine GetByName(string Name); + IEnumerable GetByName(string Name); void Add(Medicine medicine); void Remove(string medicine); + IEnumerable GetByManufacturer(string Manufacturer); } Index: FarmatikoData/Migrations/20200722131856_Initial migration.cs =================================================================== --- FarmatikoData/Migrations/20200722131856_Initial migration.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoData/Migrations/20200722131856_Initial migration.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -24,5 +24,5 @@ Phone = table.Column(nullable: true) }, - constraints: table => + constraints: table => { table.PrimaryKey("PK_HealthFacilities", x => x.Id); Index: FarmatikoData/Migrations/20200729100744_Second Migration.Designer.cs =================================================================== --- FarmatikoData/Migrations/20200729100744_Second Migration.Designer.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) +++ FarmatikoData/Migrations/20200729100744_Second Migration.Designer.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -0,0 +1,322 @@ +// +using System; +using FarmatikoData; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +namespace FarmatikoData.Migrations +{ + [DbContext(typeof(FarmatikoDataContext))] + [Migration("20200729100744_Second Migration")] + partial class SecondMigration + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn) + .HasAnnotation("ProductVersion", "3.1.6") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + modelBuilder.Entity("FarmatikoData.Models.HealthFacilities", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("Address") + .IsRequired() + .HasColumnType("text"); + + b.Property("CreatedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("DeletedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("Email") + .HasColumnType("text"); + + b.Property("Municipality") + .IsRequired() + .HasColumnType("text"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("Phone") + .HasColumnType("text"); + + b.Property("Type") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("HealthFacilities"); + }); + + modelBuilder.Entity("FarmatikoData.Models.HealthcareWorkers", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("Branch") + .IsRequired() + .HasColumnType("text"); + + b.Property("CreatedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("DeletedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("FacilityId") + .HasColumnType("integer"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("Title") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("FacilityId"); + + b.ToTable("HealthcareWorkers"); + }); + + modelBuilder.Entity("FarmatikoData.Models.Medicine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("CreatedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("DeletedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("Form") + .HasColumnType("text"); + + b.Property("Manufacturer") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Packaging") + .HasColumnType("text"); + + b.Property("Price") + .HasColumnType("real"); + + b.Property("Strength") + .HasColumnType("text"); + + b.Property("WayOfIssuing") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Medicines"); + }); + + modelBuilder.Entity("FarmatikoData.Models.MedicineList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("CreatedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("DeletedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("HasMedicine") + .HasColumnType("boolean"); + + b.Property("MedicineId") + .HasColumnType("integer"); + + b.Property("PharmacyHeadId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("MedicineId"); + + b.HasIndex("PharmacyHeadId"); + + b.ToTable("MedicineLists"); + }); + + modelBuilder.Entity("FarmatikoData.Models.Pandemic", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("ActiveGlobal") + .HasColumnType("bigint"); + + b.Property("ActiveMK") + .HasColumnType("integer"); + + b.Property("CreatedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("DeathsGlobal") + .HasColumnType("bigint"); + + b.Property("DeathsMK") + .HasColumnType("integer"); + + b.Property("DeletedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("NewMK") + .HasColumnType("integer"); + + b.Property("TotalGlobal") + .HasColumnType("bigint"); + + b.Property("TotalMK") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.ToTable("Pandemics"); + }); + + modelBuilder.Entity("FarmatikoData.Models.Pharmacy", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("Address") + .HasColumnType("text"); + + b.Property("CreatedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("DeletedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("Location") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("PharmacyHeadId") + .HasColumnType("integer"); + + b.Property("WorkAllTime") + .HasColumnType("boolean"); + + b.HasKey("Id"); + + b.HasIndex("PharmacyHeadId"); + + b.ToTable("Pharmacies"); + }); + + modelBuilder.Entity("FarmatikoData.Models.PharmacyHead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("CreatedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("DeletedOn") + .HasColumnType("timestamp without time zone"); + + b.Property("Email") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Password") + .HasColumnType("text"); + + b.Property("PharmacyId") + .HasColumnType("integer"); + + b.Property("PharmacyMedicinesId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("PharmacyId"); + + b.HasIndex("PharmacyMedicinesId"); + + b.ToTable("PharmacyHeads"); + }); + + modelBuilder.Entity("FarmatikoData.Models.HealthcareWorkers", b => + { + b.HasOne("FarmatikoData.Models.HealthFacilities", "Facility") + .WithMany() + .HasForeignKey("FacilityId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("FarmatikoData.Models.MedicineList", b => + { + b.HasOne("FarmatikoData.Models.Medicine", "Medicine") + .WithMany() + .HasForeignKey("MedicineId"); + + b.HasOne("FarmatikoData.Models.PharmacyHead", null) + .WithMany("MedicineLists") + .HasForeignKey("PharmacyHeadId"); + }); + + modelBuilder.Entity("FarmatikoData.Models.Pharmacy", b => + { + b.HasOne("FarmatikoData.Models.PharmacyHead", null) + .WithMany("PharmaciesList") + .HasForeignKey("PharmacyHeadId"); + }); + + modelBuilder.Entity("FarmatikoData.Models.PharmacyHead", b => + { + b.HasOne("FarmatikoData.Models.Pharmacy", "Pharmacy") + .WithMany() + .HasForeignKey("PharmacyId"); + + b.HasOne("FarmatikoData.Models.MedicineList", "PharmacyMedicines") + .WithMany() + .HasForeignKey("PharmacyMedicinesId"); + }); +#pragma warning restore 612, 618 + } + } +} Index: FarmatikoData/Migrations/20200729100744_Second Migration.cs =================================================================== --- FarmatikoData/Migrations/20200729100744_Second Migration.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) +++ FarmatikoData/Migrations/20200729100744_Second Migration.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -0,0 +1,143 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace FarmatikoData.Migrations +{ + public partial class SecondMigration : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_MedicineLists_Medicines_MedicineId", + table: "MedicineLists"); + + migrationBuilder.DropIndex( + name: "IX_MedicineLists_MedicineId", + table: "MedicineLists"); + + migrationBuilder.DropColumn( + name: "MedicineId", + table: "MedicineLists"); + + migrationBuilder.AlterColumn( + name: "DeletedOn", + table: "PharmacyHeads", + type: "timestamp without time zone", + nullable: false, + oldClrType: typeof(DateTime), + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "DeletedOn", + table: "Pharmacies", + type: "timestamp without time zone", + nullable: false, + oldClrType: typeof(DateTime), + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "TotalGlobal", + table: "Pandemics", + type: "integer", + nullable: false, + oldClrType: typeof(long)); + + migrationBuilder.AlterColumn( + name: "DeletedOn", + table: "Pandemics", + type: "timestamp without time zone", + nullable: false, + oldClrType: typeof(DateTime), + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "DeathsGlobal", + table: "Pandemics", + type: "integer", + nullable: false, + oldClrType: typeof(long)); + + migrationBuilder.AlterColumn( + name: "ActiveGlobal", + table: "Pandemics", + type: "integer", + nullable: false, + oldClrType: typeof(long)); + + migrationBuilder.AlterColumn( + name: "DeletedOn", + table: "Medicines", + type: "timestamp without time zone", + nullable: false, + oldClrType: typeof(DateTime), + oldNullable: true); + + migrationBuilder.AddColumn( + name: "MedicineListId", + table: "Medicines", + type: "integer", + nullable: true); + + migrationBuilder.AlterColumn( + name: "DeletedOn", + table: "MedicineLists", + type: "timestamp without time zone", + nullable: false, + oldClrType: typeof(DateTime), + oldNullable: true); + + migrationBuilder.AddColumn( + name: "MedicinesId", + table: "MedicineLists", + type: "integer", + nullable: true); + + migrationBuilder.AlterColumn( + name: "DeletedOn", + table: "HealthFacilities", + type: "timestamp without time zone", + nullable: false, + oldClrType: typeof(DateTime), + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "DeletedOn", + table: "HealthcareWorkers", + type: "timestamp without time zone", + nullable: false, + oldClrType: typeof(DateTime), + oldNullable: true); + + migrationBuilder.CreateIndex( + name: "IX_Medicines_MedicineListId", + table: "Medicines", + column: "MedicineListId"); + + migrationBuilder.CreateIndex( + name: "IX_MedicineLists_MedicinesId", + table: "MedicineLists", + column: "MedicinesId"); + + migrationBuilder.AddForeignKey( + name: "FK_MedicineLists_Medicines_MedicinesId", + table: "MedicineLists", + column: "MedicinesId", + principalTable: "Medicines", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + + migrationBuilder.AddForeignKey( + name: "FK_Medicines_MedicineLists_MedicineListId", + table: "Medicines", + column: "MedicineListId", + principalTable: "MedicineLists", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + } + } +} Index: FarmatikoData/Migrations/FarmatikoDataContextModelSnapshot.cs =================================================================== --- FarmatikoData/Migrations/FarmatikoDataContextModelSnapshot.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoData/Migrations/FarmatikoDataContextModelSnapshot.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -34,5 +34,5 @@ .HasColumnType("timestamp without time zone"); - b.Property("DeletedOn") + b.Property("DeletedOn") .HasColumnType("timestamp without time zone"); @@ -74,5 +74,5 @@ .HasColumnType("timestamp without time zone"); - b.Property("DeletedOn") + b.Property("DeletedOn") .HasColumnType("timestamp without time zone"); @@ -104,5 +104,5 @@ .HasColumnType("timestamp without time zone"); - b.Property("DeletedOn") + b.Property("DeletedOn") .HasColumnType("timestamp without time zone"); @@ -112,7 +112,4 @@ b.Property("Manufacturer") .HasColumnType("text"); - - b.Property("MedicineListId") - .HasColumnType("integer"); b.Property("Name") @@ -133,6 +130,4 @@ b.HasKey("Id"); - b.HasIndex("MedicineListId"); - b.ToTable("Medicines"); }); @@ -148,5 +143,5 @@ .HasColumnType("timestamp without time zone"); - b.Property("DeletedOn") + b.Property("DeletedOn") .HasColumnType("timestamp without time zone"); @@ -154,5 +149,5 @@ .HasColumnType("boolean"); - b.Property("MedicinesId") + b.Property("MedicineId") .HasColumnType("integer"); @@ -162,5 +157,5 @@ b.HasKey("Id"); - b.HasIndex("MedicinesId"); + b.HasIndex("MedicineId"); b.HasIndex("PharmacyHeadId"); @@ -176,6 +171,6 @@ .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - b.Property("ActiveGlobal") - .HasColumnType("integer"); + b.Property("ActiveGlobal") + .HasColumnType("bigint"); b.Property("ActiveMK") @@ -185,11 +180,11 @@ .HasColumnType("timestamp without time zone"); - b.Property("DeathsGlobal") - .HasColumnType("integer"); + b.Property("DeathsGlobal") + .HasColumnType("bigint"); b.Property("DeathsMK") .HasColumnType("integer"); - b.Property("DeletedOn") + b.Property("DeletedOn") .HasColumnType("timestamp without time zone"); @@ -200,6 +195,6 @@ .HasColumnType("integer"); - b.Property("TotalGlobal") - .HasColumnType("integer"); + b.Property("TotalGlobal") + .HasColumnType("bigint"); b.Property("TotalMK") @@ -224,5 +219,5 @@ .HasColumnType("timestamp without time zone"); - b.Property("DeletedOn") + b.Property("DeletedOn") .HasColumnType("timestamp without time zone"); @@ -256,5 +251,5 @@ .HasColumnType("timestamp without time zone"); - b.Property("DeletedOn") + b.Property("DeletedOn") .HasColumnType("timestamp without time zone"); @@ -292,16 +287,9 @@ }); - modelBuilder.Entity("FarmatikoData.Models.Medicine", b => - { - b.HasOne("FarmatikoData.Models.MedicineList", null) - .WithMany("MedicinesList") - .HasForeignKey("MedicineListId"); - }); - modelBuilder.Entity("FarmatikoData.Models.MedicineList", b => { - b.HasOne("FarmatikoData.Models.Medicine", "Medicines") + b.HasOne("FarmatikoData.Models.Medicine", "Medicine") .WithMany() - .HasForeignKey("MedicinesId"); + .HasForeignKey("MedicineId"); b.HasOne("FarmatikoData.Models.PharmacyHead", null) Index: FarmatikoData/Models/Medicine.cs =================================================================== --- FarmatikoData/Models/Medicine.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoData/Models/Medicine.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; -using FarmatikoData.Base; -using Microsoft.EntityFrameworkCore; +using FarmatikoData.Base; namespace FarmatikoData.Models Index: FarmatikoServices/FarmatikoServiceInterfaces/IHealthFacilityService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IHealthFacilityService.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoServices/FarmatikoServiceInterfaces/IHealthFacilityService.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -8,7 +8,5 @@ public interface IHealthFacilityService { - IEnumerable GetByName(string name); IEnumerable GetAll(); - IEnumerable GetByType(string Type); void Add(HealthFacilities healthFacility); } Index: FarmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkerService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkerService.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkerService.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -1,14 +1,15 @@ using FarmatikoData.Models; +using System; using System.Collections.Generic; +using System.Text; -namespace FarmatikoData.FarmatikoServiceInterfaces +namespace FarmatikoServices.FarmatikoServiceInterfaces { public interface IHealthcareWorkerService { IEnumerable GetAll(); - HealthcareWorkers GetByName(string Name); - IEnumerable GetAllByBranch(string Branch); - IEnumerable GetAllByFacility(HealthFacilities Facility); - void Add(HealthcareWorkers HealthcareWorker); + void Add(HealthcareWorkers healthcareWorker); + //Not needed + /*void Remove(HealthcareWorkers healthcareWorker);*/ } } Index: FarmatikoServices/FarmatikoServiceInterfaces/IMedicineListService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IMedicineListService.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) +++ FarmatikoServices/FarmatikoServiceInterfaces/IMedicineListService.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -0,0 +1,15 @@ +using FarmatikoData.Models; +using System; +using System.Collections.Generic; +using System.Text; + +namespace FarmatikoServices.FarmatikoServiceInterfaces +{ + public interface IMedicineListService + { + ICollection GetAll(); + void SetHasMedicine(MedicineList medicineList, bool HasMedicine); + ICollection GetByName(string Name); + ICollection GetByManufacturer(string Manufacturer); + } +} Index: FarmatikoServices/FarmatikoServiceInterfaces/IMedicineService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IMedicineService.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) +++ FarmatikoServices/FarmatikoServiceInterfaces/IMedicineService.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -0,0 +1,16 @@ +using FarmatikoData.Models; +using System; +using System.Collections.Generic; +using System.Text; + +namespace FarmatikoServices.FarmatikoServiceInterfaces +{ + public interface IMedicineService + { + IEnumerable GetAll(); + void Add(Medicine medicine); + void Remove(string Medicine); + IEnumerable GetByName(string Name); + IEnumerable GetByManufacturer(string Manufacturer); + } +} Index: FarmatikoServices/Services/HealthFacilityService.cs =================================================================== --- FarmatikoServices/Services/HealthFacilityService.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoServices/Services/HealthFacilityService.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -25,14 +25,4 @@ return _healthFacilityRepository.GetAll(); } - - public IEnumerable GetByName(string name) - { - return _healthFacilityRepository.GetAllByName(name); - } - - public IEnumerable GetByType(string Type) - { - return _healthFacilityRepository.GetByType(Type); - } } } Index: FarmatikoServices/Services/HealthcareWorkerService.cs =================================================================== --- FarmatikoServices/Services/HealthcareWorkerService.cs (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) +++ FarmatikoServices/Services/HealthcareWorkerService.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -1,5 +1,6 @@ -using FarmatikoData.FarmatikoRepoInterfaces; -using FarmatikoData.FarmatikoServiceInterfaces; +using FarmatikoData.FarmatikoRepo; +using FarmatikoData.FarmatikoRepoInterfaces; using FarmatikoData.Models; +using FarmatikoServices.FarmatikoServiceInterfaces; using System; using System.Collections.Generic; @@ -10,32 +11,17 @@ public class HealthcareWorkerService : IHealthcareWorkerService { - private IHealthcareWorkersRepository _workersRepository; - public HealthcareWorkerService(IHealthcareWorkersRepository workersRepository) + private IHealthcareWorkerRepository _healthcareWorkerRepo; + public HealthcareWorkerService(IHealthcareWorkerRepository healthcareWorkerRepo) { - _workersRepository = workersRepository; + _healthcareWorkerRepo = healthcareWorkerRepo; } - public void Add(HealthcareWorkers HealthcareWorker) + public void Add(HealthcareWorkers healthcareWorker) { - _workersRepository.Add(HealthcareWorker); + _healthcareWorkerRepo.Add(healthcareWorker); } public IEnumerable GetAll() { - return _workersRepository.GetAll(); - } - - public IEnumerable GetAllByBranch(string Branch) - { - return _workersRepository.GetByBranch(Branch); - } - - public IEnumerable GetAllByFacility(HealthFacilities Facility) - { - return _workersRepository.GetByFacility(Facility); - } - - public HealthcareWorkers GetByName(string Name) - { - return _workersRepository.GetByName(Name); + return _healthcareWorkerRepo.GetAll(); } } Index: FarmatikoServices/Services/MedicineListService.cs =================================================================== --- FarmatikoServices/Services/MedicineListService.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) +++ FarmatikoServices/Services/MedicineListService.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -0,0 +1,38 @@ +using FarmatikoData.FarmatikoRepo; +using FarmatikoData.Models; +using FarmatikoServices.FarmatikoServiceInterfaces; +using System; +using System.Collections.Generic; +using System.Text; + +namespace FarmatikoServices.Services +{ + public class MedicineListService : IMedicineListService + { + private IMedicineListRepository _medicineListRepository; + public MedicineListService(IMedicineListRepository medicineListRepository) + { + _medicineListRepository = medicineListRepository; + } + + public ICollection GetAll() + { + return _medicineListRepository.GetAll(); + } + + public ICollection GetByManufacturer(string Manufacturer) + { + return _medicineListRepository.GetByManufacturer(Manufacturer); + } + + public ICollection GetByName(string Name) + { + return _medicineListRepository.GetByName(Name); + } + + public void SetHasMedicine(MedicineList medicineList, bool HasMedicine) + { + throw new NotImplementedException(); + } + } +} Index: FarmatikoServices/Services/MedicineService.cs =================================================================== --- FarmatikoServices/Services/MedicineService.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) +++ FarmatikoServices/Services/MedicineService.cs (revision e42f61a81e3d21811e04fddc9568197a096eadd7) @@ -0,0 +1,41 @@ +using FarmatikoData.FarmatikoRepoInterfaces; +using FarmatikoData.Models; +using FarmatikoServices.FarmatikoServiceInterfaces; +using System.Collections.Generic; + +namespace FarmatikoServices.Services +{ + public class MedicineService : IMedicineService + { + private IMedicineRepository _medicineRepository; + public MedicineService(IMedicineRepository medicineRepository) + { + _medicineRepository = medicineRepository; + } + + public void Add(Medicine medicine) + { + _medicineRepository.Add(medicine); + } + + public IEnumerable GetAll() + { + return _medicineRepository.GetAll(); + } + + public IEnumerable GetByManufacturer(string Manufacturer) + { + return _medicineRepository.GetByManufacturer(Manufacturer); + } + + public IEnumerable GetByName(string Name) + { + return _medicineRepository.GetByName(Name); + } + + public void Remove(string Medicine) + { + _medicineRepository.Remove(Medicine); + } + } +}